diff --git a/DESCRIPTION b/DESCRIPTION index 1fffecb..8c839c8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Encoding: UTF-8 Package: tikzDevice Type: Package Title: R Graphics Output in LaTeX Format -Version: 0.12.3 +Version: 0.12.3.1 Authors@R: c( person("Charlie", "Sharpsteen", role = "aut"), person("Cameron", "Bracken", role = "aut"), person("Kirill", "Müller", role = c("ctb"), email = diff --git a/NEWS.md b/NEWS.md index 727ce80..03e6713 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,12 @@ +# tikzDevice 0.12.3.1 (unreleased) + +Bug fixes +--------- + +- current working directory is added to TEXINPUTS (#198) + + + # tikzDevice 0.12.3 (2019-08-07) Bug fixes diff --git a/R/latexStrWidth.R b/R/latexStrWidth.R index a54b029..3ee35d5 100644 --- a/R/latexStrWidth.R +++ b/R/latexStrWidth.R @@ -259,7 +259,10 @@ getMetricsFromLatex <- function(TeXMetrics, verbose = verbose, diagnose = FALSE) texDir <- tempfile("tikzDevice") dir.create(texDir) oldwd <- getwd() - on.exit(setwd(oldwd)) + tex_inputs <- Sys.getenv("TEXINPUTS") + on.exit(Sys.setenv(TEXINPUTS = tex_inputs)) + Sys.setenv(TEXINPUTS = paste(oldwd, tex_inputs, sep = .Platform$path.sep)) + on.exit(setwd(oldwd), add = TRUE) setwd(texDir) texLog <- "tikzStringWidthCalc.log" texFile <- "tikzStringWidthCalc.tex" diff --git a/tests/testthat/helper_graphics.R b/tests/testthat/helper_graphics.R index 4723b4b..61588df 100644 --- a/tests/testthat/helper_graphics.R +++ b/tests/testthat/helper_graphics.R @@ -131,7 +131,7 @@ compare_graph <- function(graph_name, tags) { # Normalize and quote some paths in case we are running on Windows compare_output <- file.path(test_work_dir, paste0(graph_name, "_diff.png")) command_line <- paste( - shQuote(compare_cmd), "-density 300", "-metric AE", + shQuote(compare_cmd), "-density 300", "-metric AE", "-quiet", shQuote(test_output), shQuote(standard_graph), shQuote(compare_output), "2>&1 | awk '{metric=$NF};END{print metric}'" ) diff --git a/tests/testthat/test_error_handling.R b/tests/testthat/test_error_handling.R index 80565bb..a14bdc9 100644 --- a/tests/testthat/test_error_handling.R +++ b/tests/testthat/test_error_handling.R @@ -1,9 +1,8 @@ context("Test tikzDevice error and warning messages") test_that("Null device is not a tikzDevice", { - expect_that( - suppressMessages(isTikzDevice()), - is_false() + expect_false( + suppressMessages(isTikzDevice()) ) }) diff --git a/tests/testthat/test_metrics_dict.R b/tests/testthat/test_metrics_dict.R index 54eae51..ae91d1a 100644 --- a/tests/testthat/test_metrics_dict.R +++ b/tests/testthat/test_metrics_dict.R @@ -4,8 +4,8 @@ test_that("Temporary metrics dictionary is created, but only once", { expect_equal(getOption("tikzMetricsDictionary"), NULL) rm(list = ls(envir = .tikzInternal), envir = .tikzInternal) - expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating")) - expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message())) + expect_message(checkDictionaryStatus(verbose = TRUE), "Creating") + expect_silent(checkDictionaryStatus(verbose = TRUE)) expect_true(file.exists(.tikzInternal[["db_file"]])) }) @@ -13,8 +13,8 @@ test_that("Silent creation of temporary metrics dictionary", { expect_equal(getOption("tikzMetricsDictionary"), NULL) rm(list = ls(envir = .tikzInternal), envir = .tikzInternal) - expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message())) - expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message())) + expect_silent(checkDictionaryStatus(verbose = FALSE)) + expect_silent(checkDictionaryStatus(verbose = FALSE)) expect_true(file.exists(.tikzInternal[["db_file"]])) }) @@ -27,23 +27,23 @@ test_that("Switching metrics dictionary", { tryCatch( { options(tikzMetricsDictionary = tempA) - expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating")) - expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message())) + expect_message(checkDictionaryStatus(verbose = TRUE), "Creating") + expect_silent(checkDictionaryStatus(verbose = TRUE)) options(tikzMetricsDictionary = tempB) - expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating")) - expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message())) + expect_message(checkDictionaryStatus(verbose = TRUE), "Creating") + expect_silent(checkDictionaryStatus(verbose = TRUE)) options(tikzMetricsDictionary = tempA) - expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Using")) - expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message())) + expect_message(checkDictionaryStatus(verbose = TRUE), "Using") + expect_silent(checkDictionaryStatus(verbose = TRUE)) options(tikzMetricsDictionary = tempB) - expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Using")) - expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message())) + expect_message(checkDictionaryStatus(verbose = TRUE), "Using") + expect_silent(checkDictionaryStatus(verbose = TRUE)) options(tikzMetricsDictionary = tempA) - expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message())) - expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message())) + expect_silent(checkDictionaryStatus(verbose = FALSE)) + expect_silent(checkDictionaryStatus(verbose = FALSE)) options(tikzMetricsDictionary = tempB) - expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message())) - expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message())) + expect_silent(checkDictionaryStatus(verbose = FALSE)) + expect_silent(checkDictionaryStatus(verbose = FALSE)) }, finally = { options(tikzMetricsDictionary = NULL) @@ -61,17 +61,17 @@ test_that("Turning custom metrics dictionary on and off", { tryCatch( { options(tikzMetricsDictionary = temp) - expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating")) - expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message())) + expect_message(checkDictionaryStatus(verbose = TRUE), "Creating") + expect_silent(checkDictionaryStatus(verbose = TRUE)) options(tikzMetricsDictionary = NULL) - expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating")) - expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message())) + expect_message(checkDictionaryStatus(verbose = TRUE), "Creating") + expect_silent(checkDictionaryStatus(verbose = TRUE)) options(tikzMetricsDictionary = temp) - expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Using")) - expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message())) + expect_message(checkDictionaryStatus(verbose = TRUE), "Using") + expect_silent(checkDictionaryStatus(verbose = TRUE)) options(tikzMetricsDictionary = NULL) - expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating")) - expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message())) + expect_message(checkDictionaryStatus(verbose = TRUE), "Creating") + expect_silent(checkDictionaryStatus(verbose = TRUE)) }, finally = { options(tikzMetricsDictionary = NULL)