Skip to content

Commit 5d865ed

Browse files
authored
Merge pull request #280 from Merck/bug-fix-#277
Fix formatting of totalpage in conversion.R
2 parents ec75770 + 41b4a96 commit 5d865ed

8 files changed

Lines changed: 7 additions & 13 deletions

R/as_rtf_pageby.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ as_rtf_pageby <- function(tbl) {
247247
by_var_dict$id <- apply(by_var_dict, 1, paste, collapse = "-")
248248

249249

250-
251250
pageby_header_nested <- merge(pageby_header, by_var_dict, all.x = TRUE)
252251
pageby_header_nested$index <- pageby_header_nested$index - 0.1
253252

R/conversion.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ convert <- function(text,
8484
"<=" = "\\leq ",
8585
"\n" = "\\line ",
8686
"\\pagenumber" = "\\chpgn ",
87-
"\\totalpage" = "\\totalpage ",
87+
"\\totalpage" = "\\totalpage",
8888
"\\pagefield" = "{\\field{\\*\\fldinst NUMPAGES }} "
8989
)
9090

R/rtf_encode_table.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ rtf_encode_table <- function(tbl, verbose = FALSE) {
4848
pageby <- attr(tbl, "rtf_pageby")
4949

5050
start_rtf <- paste(
51-
5251
as_rtf_init(),
5352
as_rtf_font(tbl),
5453
as_rtf_color(tbl),

R/rtf_rich_text.R

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,12 @@
5252
#' )
5353
#' )
5454
rtf_rich_text <- function(
55-
text,
56-
theme = list(
57-
.emph = list(format = "i"),
58-
.strong = list(format = "b")
59-
)) {
55+
text,
56+
theme = list(
57+
.emph = list(format = "i"),
58+
.strong = list(format = "b")
59+
)
60+
) {
6061
# Bulletproof the styles requested within the `theme` argument
6162
theme_arg <- theme
6263
names(theme_arg) <- NULL

R/rtf_table_content.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ rtf_table_content <- function(tbl,
7474
text_indent_right <- attr(tbl, "text_indent_right")
7575

7676

77-
7877
text_convert <- attr(tbl, "text_convert")
7978

8079
## get dimension of tbl

R/write_rtf.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ write_rtf_para <- function(rtf, file) {
6161
rtf_color <- paste(c("{\\colortbl\n;", col_tb$rtf_code, "}"), collapse = "\n")
6262

6363
start_rtf <- paste(
64-
6564
as_rtf_init(),
6665
as_rtf_font(),
6766
rtf_color,

tests/testthat/test-independent-testing-rtf_encode_table.R

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,14 +124,12 @@ test_that("RTF header, footnote and source encoding for different location", {
124124
footnote_rtftext_1 <- as_rtf_footnote(d3)
125125

126126

127-
128127
expect_true(grep(as_rtf_footnote(d3), encode1, fixed = TRUE) == 2)
129128
expect_true(grep(as_rtf_source(d3), encode1, fixed = TRUE) == 2)
130129
expect_true(grep(as_rtf_title(d3), encode1, fixed = TRUE) == 2)
131130
})
132131

133132

134-
135133
test_that("input value test if data frame or list of data frames", {
136134
m <- iris[1:2, ]
137135
m1 <- m |> rtf_body(

tests/testthat/test-independent-testing-rtf_nrow.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ irspagebybodys <- attr(attr(irs1, "rtf_pageby_table"), "rtf_nrow")
105105
irspagebyrows <- attr(attr(irs1, "rtf_pageby_row")$Species, "rtf_nrow")
106106

107107

108-
109108
test_that("test if rtf_nline_vector() return to correct numbers", {
110109
# line for first vector
111110
expect_equal(nline_vector[1], 1)

0 commit comments

Comments
 (0)