Skip to content

Commit 1e4c965

Browse files
krlmlrkrlmlr
committed
fix mistakes after scope = indention
@lorenzwalthert: This commit undoes the changes by styler that looked odd to me.
1 parent fa4edd3 commit 1e4c965

File tree

3 files changed

+57
-44
lines changed

3 files changed

+57
-44
lines changed

‎R/latexStrWidth.R

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ getLatexStrWidth <- function(texString, cex = 1, face = 1, engine = getOption("t
9090
"\tpdftex\n",
9191
"\txetex\n",
9292
"\tluatex\n")
93-
})
93+
}
94+
)
9495

9596
# Create an object that contains the string and it's
9697
# properties.
@@ -180,7 +181,8 @@ getLatexCharMetrics <- function(charCode, cex = 1, face = 1, engine = getOption(
180181
"\tpdftex\n",
181182
"\txetex\n",
182183
"\tluatex\n")
183-
})
184+
}
185+
)
184186

185187
# We must be given an integer character code.
186188
if (!is.numeric(charCode)) {
@@ -293,7 +295,8 @@ getMetricsFromLatex <- function(TeXMetrics, verbose = verbose) {
293295
},
294296
luatex = {
295297
writeLines(getOption("tikzUnicodeMetricPackages"), texIn)
296-
})
298+
}
299+
)
297300

298301
writeLines("\\batchmode", texIn)
299302

@@ -343,7 +346,9 @@ getMetricsFromLatex <- function(TeXMetrics, verbose = verbose) {
343346

344347
symbol = {
345348
# We are currently ignoring R's symbol fonts.
346-
}) # End output font face switch.
349+
}
350+
351+
) # End output font face switch.
347352

348353

349354
# Now for the content. For string width we set the whole string in
@@ -361,7 +366,10 @@ getMetricsFromLatex <- function(TeXMetrics, verbose = verbose) {
361366
char = {
362367

363368
nodeContent <- paste(nodeContent, "\\char", TeXMetrics$value, sep = "")
364-
}) # End switch for metric type.
369+
370+
}
371+
372+
) # End switch for metric type.
365373

366374
message("Measuring dimensions of: ", nodeContent);
367375

‎R/tikz.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,8 @@ tikz <- function(file = ifelse(onefile, "./Rplots.tex", "./Rplot%03d.tex"),
271271
"\tpdftex\n",
272272
"\txetex\n",
273273
"\tluatex\n")
274-
})
274+
}
275+
)
275276

276277
# Ensure the standAlone option will trump the bareBones option.
277278
if (standAlone) {

‎tests/testthat/test_metrics_dict.R

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -24,54 +24,58 @@ test_that("Switching metrics dictionary", {
2424
tempA <- file.path(getwd(), ".tikzTempA")
2525
tempB <- file.path(getwd(), ".tikzTempB")
2626

27-
tryCatch({
28-
options(tikzMetricsDictionary = tempA)
29-
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating"))
30-
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
31-
options(tikzMetricsDictionary = tempB)
32-
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating"))
33-
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
34-
options(tikzMetricsDictionary = tempA)
35-
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Using"))
36-
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
37-
options(tikzMetricsDictionary = tempB)
38-
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Using"))
39-
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
40-
options(tikzMetricsDictionary = tempA)
41-
expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message()))
42-
expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message()))
43-
options(tikzMetricsDictionary = tempB)
44-
expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message()))
45-
expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message()))
46-
},
47-
finally = {
27+
tryCatch(
28+
{
29+
options(tikzMetricsDictionary = tempA)
30+
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating"))
31+
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
32+
options(tikzMetricsDictionary = tempB)
33+
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating"))
34+
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
35+
options(tikzMetricsDictionary = tempA)
36+
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Using"))
37+
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
38+
options(tikzMetricsDictionary = tempB)
39+
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Using"))
40+
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
41+
options(tikzMetricsDictionary = tempA)
42+
expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message()))
43+
expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message()))
44+
options(tikzMetricsDictionary = tempB)
45+
expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message()))
46+
expect_that(checkDictionaryStatus(verbose = FALSE), not(shows_message()))
47+
},
48+
finally = {
4849
options(tikzMetricsDictionary = NULL)
4950
unlink(tempA, recursive = TRUE)
5051
unlink(tempB, recursive = TRUE)
51-
})
52+
}
53+
)
5254
})
5355

5456
test_that("Turning custom metrics dictionary on and off", {
5557
expect_equal(getOption("tikzMetricsDictionary"), NULL)
5658

5759
temp <- file.path(getwd(), ".tikzTemp")
5860

59-
tryCatch({
60-
options(tikzMetricsDictionary = temp)
61-
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating"))
62-
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
63-
options(tikzMetricsDictionary = NULL)
64-
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating"))
65-
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
66-
options(tikzMetricsDictionary = temp)
67-
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Using"))
68-
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
69-
options(tikzMetricsDictionary = NULL)
70-
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating"))
71-
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
72-
},
73-
finally = {
61+
tryCatch(
62+
{
63+
options(tikzMetricsDictionary = temp)
64+
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating"))
65+
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
66+
options(tikzMetricsDictionary = NULL)
67+
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating"))
68+
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
69+
options(tikzMetricsDictionary = temp)
70+
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Using"))
71+
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
72+
options(tikzMetricsDictionary = NULL)
73+
expect_that(checkDictionaryStatus(verbose = TRUE), shows_message("Creating"))
74+
expect_that(checkDictionaryStatus(verbose = TRUE), not(shows_message()))
75+
},
76+
finally = {
7477
options(tikzMetricsDictionary = NULL)
7578
unlink(temp, recursive = TRUE)
76-
})
79+
}
80+
)
7781
})

0 commit comments

Comments
 (0)