Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

202 fix trimming@main #203

Merged
merged 27 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
cdcb82a
rough solution
ayogasekaram Sep 26, 2023
25e4c8a
apply conditions
ayogasekaram Sep 26, 2023
f1c23b0
Temp fix for footnotes
edelarua Sep 26, 2023
37ad4ad
adding tests. Updating documentation.
ayogasekaram Sep 26, 2023
c78ce68
some minor testing
Melkiades Sep 27, 2023
c9576ce
more comments and draft
Melkiades Sep 27, 2023
1f31c31
the refactoring
Melkiades Sep 27, 2023
1803555
fix and error
Melkiades Sep 27, 2023
eb13af2
fixes and update of tests
Melkiades Sep 27, 2023
bfe548a
working update
Melkiades Oct 2, 2023
bedd6cf
adding word splits
Melkiades Oct 2, 2023
e76cdb5
fixing tests
Melkiades Oct 2, 2023
7e41491
completing fix
Melkiades Oct 2, 2023
2e63a72
fixes
Melkiades Oct 2, 2023
f6a0b3c
Update R/tostring.R
Melkiades Oct 3, 2023
c4e75d6
being smarter
Melkiades Oct 3, 2023
fb2baf7
roxygen
Melkiades Oct 3, 2023
f5fda5c
Merge branch '202_fix_trimming@main' of github.com:insightsengineerin…
Melkiades Oct 3, 2023
fe2cde3
Merge branch 'main' into 202_fix_trimming@main
edelarua Oct 5, 2023
ffa8cfa
fixes
Melkiades Oct 6, 2023
e0411f7
fixes for rlistings
Melkiades Oct 6, 2023
34062de
Apply suggestions from code review
Melkiades Oct 6, 2023
8e33971
exception for empty ContentRow s
Melkiades Oct 7, 2023
eb054a0
Merge branch '202_fix_trimming@main' of github.com:insightsengineerin…
Melkiades Oct 7, 2023
6bd0836
fix mf_rinfo is null
Melkiades Oct 7, 2023
e6e6271
fix for rtables
Melkiades Oct 10, 2023
61b1e36
Merge branch 'main' into 202_fix_trimming@main
Melkiades Oct 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Suggests:
huxtable (>= 2.0.0),
knitr (>= 1.42),
r2rtf (>= 0.3.2),
stringi (>= 1.6),
testthat (>= 3.0.4)
VignetteBuilder:
knitr
Expand Down
5 changes: 3 additions & 2 deletions R/mpf_exporters.R
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ export_as_txt <- function(x,
}
## we dont' set widths here because we already but that info on mpf
## so its on each of the pages.
strings <- vapply(pages, toString, "", hsep = hsep, tf_wrap = tf_wrap, max_width = max_width)
strings <- vapply(pages, toString, "", widths = NULL,
hsep = hsep, tf_wrap = tf_wrap, max_width = max_width)
res <- paste(strings, collapse = page_break)

if(is.null(file))
Expand Down Expand Up @@ -408,7 +409,7 @@ export_as_rtf <- function(x,
if(is.null(names(margins)))
names(margins) <- marg_order

fullmf <- matrix_form(x)
fullmf <- matrix_form(x, indent_rownames = TRUE)
req_ncols <- ncol(fullmf) + as.numeric(mf_has_rlabels(fullmf))
if(!is.null(colwidths) && length(colwidths) != req_ncols)
stop("non-null colwidths argument must have length ncol(x) (+ 1 if row labels are present) [",
Expand Down
Loading