Merge branch 'main' into revdep_0_4_0

NEWS.md

@@ -43,6 +43,7 @@ MathJax = {
 * `glue::glue()` string is accepted by `format_tt()`. Thanks to @LukasWallrich for report #792 on the `modelsummary` repository.
 * Support Github Flavored Markdown (`gfm`) output. Thanks to @kylebutts for contribution #315. 
 * `theme_tt("rotate")` to rotate tables in LaTeX or Typst.
+* `save_tt("/path/to/file")` returns the file path invisibly. Thanks to @yjunechoe for issue #328.
 
 ### HTML
 

R/group_bootstrap.R

@@ -50,7 +50,7 @@ group_bootstrap_col <- function(x, j, ihead, ...) {
   # midrule on numbered spans (not full columns of body)
   jnames <- names(j)
   jnames <- seq_along(jnames)[trimws(jnames) != ""]
-  x <- style_eval(x, i = ihead, j = jnames, line = "b", line_width = .05, line_color = "#d3d8dc")
+  x <- style_eval(x, i = ihead, j = jnames, line = "b", line_width = 0.05, line_color = "#d3d8dc")
 
   return(x)
 }

R/group_tabularray.R

@@ -129,11 +129,11 @@ insert_values <- function(vec, values, positions) {
   positions <- positions[ord]
 
   # Create a vector of indices for the original vector
-  original_indices <- 1:length(vec)
+  original_indices <- seq_along(vec)
 
 
   # Insert values and update indices
-  for (i in 1:length(values)) {
+  for (i in seq_along(values)) {
     vec <- append(vec, values[i], after = positions[i] - 1)
     original_indices <- append(original_indices, NA, after = positions[i] - 1)
   }

R/group_typst.R

@@ -53,7 +53,7 @@ group_typst_col <- function(x, j, ihead, ...) {
   idx <- order(max_col)
   j <- j[idx]
   lab <- names(j)
-  len <- sapply(j, length)
+  len <- lengths(j)
   col <- ifelse(
     trimws(lab) == "",
     sprintf("[%s],", lab),

R/save_tt.R

@@ -7,7 +7,7 @@
 #' + If `output` is "markdown", "latex", "html", or "typst", the table is returned in a string as an `R` object.
 #' + If `output` is a valid file path, the table is saved to file. The supported extensions are: .docx, .html, .png, .pdf, .tex, .typ, and .md (with aliases .txt, .Rmd and .qmd).
 #' @param overwrite A logical value indicating whether to overwrite an existing file.
-#' @return A string or `TRUE` when the table is written to file.
+#' @return A string with the table when `output` is a format, and the file path when `output` is a valid path.
 #' @export
 #' @examples
 #' library(tinytable)
@@ -126,7 +126,7 @@ save_tt <- function(x, output, overwrite = FALSE) {
     pandoc::pandoc_convert(text = x@table_string, to = "docx", output = output)
   }
 
-  return(invisible(TRUE))
+  return(invisible(path.expand(output)))
 }
 
 

R/style_bootstrap.R

@@ -21,7 +21,7 @@ setMethod(
                         alignv = NULL,
                         line = NULL,
                         line_color = "black",
-                        line_width = .1,
+                        line_width = 0.1,
                         colspan = NULL,
                         rowspan = NULL,
                         indent = 0,

R/style_tabularray.R

@@ -16,7 +16,7 @@ setMethod(
                              alignv = NULL,
                              line = NULL,
                              line_color = "black",
-                             line_width = .1,
+                             line_width = 0.1,
                              colspan = NULL,
                              rowspan = NULL,
                              indent = 0,

R/style_tt.R

@@ -261,7 +261,7 @@ style_tt_lazy <- function (x,
       msg <- sprintf("`align` must be a single character or a string of length %s.", nalign)
       stop(msg, call. = FALSE)
     } 
-    if (any(!align %in% c("c", "l", "r", "d"))) {
+    if (!all(align %in% c("c", "l", "r", "d"))) {
       msg <- "`align` must be characters c, l, r, or d."
       stop(msg, call. = FALSE)
     }

R/style_typst.R

@@ -20,7 +20,7 @@ setMethod(
                         align = NULL,
                         line = NULL,
                         line_color = "black",
-                        line_width = .1,
+                        line_width = 0.1,
                         colspan = NULL,
                         indent = 0,
                         midrule = FALSE, # undocumented, only used by `group_tt()`
@@ -132,7 +132,7 @@ setMethod(
             out <- lines_drop(out, "// tinytable align-default-array here", fixed = TRUE) 
             out <- lines_insert(out, align_default, "tinytable align-default-array after", "after")
         } else if (length(align_value) %in% c(1, length(ival) * length(jval))) {
-            if (length(align_value == 1)) align_value <- rep(align_value, length(ival) * length(jval))
+            if (length(align_value) == 1) align_value <- rep(align_value, length(ival) * length(jval))
             counter <- 0
             for (k in ival) {
                 for (w in jval) {

R/theme_tt.R

@@ -1,9 +1,9 @@
 theme_default <- function(x, ...) {
     fn <- function(table) {
         if (isTRUE(table@output == "typst")) {
-            table <- style_eval(table, i = 1 - table@nhead, line = "t", line_width = .1)
-            table <- style_eval(table, i = 0, line = "b", line_width = .05)
-            table <- style_eval(table, i = nrow(table), line = "b", line_width = .1)
+            table <- style_eval(table, i = 1 - table@nhead, line = "t", line_width = 0.1)
+            table <- style_eval(table, i = 0, line = "b", line_width = 0.05)
+            table <- style_eval(table, i = nrow(table), line = "b", line_width = 0.1)
         }
 
         return(table)
@@ -168,12 +168,12 @@ theme_striped <- function(x, ...) {
     assert_class(x, "tinytable")
     fn <- function(table) {
         if (isTRUE(table@output == "typst")) {
-            table <- style_eval(table, i = 1 - table@nhead, line = "t", line_width = .1)
-            table <- style_eval(table, i = 0, line = "b", line_width = .05)
-            table <- style_eval(table, i = nrow(table), line = "b", line_width = .1)
-            table <- style_eval(table, i = 1 - table@nhead, line = "t", line_width = .1)
-            table <- style_eval(table, i = 0, line = "b", line_width = .05)
-            table <- style_eval(table, i = nrow(table), line = "b", line_width = .1)
+            table <- style_eval(table, i = 1 - table@nhead, line = "t", line_width = 0.1)
+            table <- style_eval(table, i = 0, line = "b", line_width = 0.05)
+            table <- style_eval(table, i = nrow(table), line = "b", line_width = 0.1)
+            table <- style_eval(table, i = 1 - table@nhead, line = "t", line_width = 0.1)
+            table <- style_eval(table, i = 0, line = "b", line_width = 0.05)
+            table <- style_eval(table, i = nrow(table), line = "b", line_width = 0.1)
             table <- style_eval(table, i = seq(1, nrow(table), by = 2), background = "#ededed")
         }
         return(table)

R/tt_bootstrap.R

@@ -146,7 +146,7 @@ setMethod(
 
   if (is.null(x@theme[[1]]) || is.function(x@theme[[1]]) || isTRUE("default" %in% x@theme[[1]])) {
     x <- style_eval(x, bootstrap_class = "table table-borderless",
-      i = 0, line = "b", line_color = "#d3d8dc", line_width = .1)
+      i = 0, line = "b", line_color = "#d3d8dc", line_width = 0.1)
   } else if ("bootstrap" %in% x@theme[[1]]) {
     x <- style_eval(x, bootstrap_class = "table")
   } else if ("striped" %in% x@theme[[1]]) {

R/tt_grid.R

@@ -34,7 +34,7 @@ tt_eval_grid  <- function(x, width_cols = NULL, ...) {
   tab <- matrix(padded, ncol = ncol(tab))
 
   if (is.null(width_cols) || length(width_cols) == 0) {
-    for (j in 1:ncol(tab)) {
+    for (j in seq_len(ncol(tab))) {
       if (isTRUE(check_dependency("fansi"))) {
         width_cols[j] <- max(nchar(as.character(fansi::strip_ctl(tab[, j]))))
       } else {
@@ -56,7 +56,7 @@ tt_eval_grid  <- function(x, width_cols = NULL, ...) {
     }
   }
 
-  for (j in 1:ncol(x)) {
+  for (j in seq_len(ncol(x))) {
     if (isTRUE(check_dependency("fansi"))) {
       nc <- nchar(fansi::strip_ctl(tab[, j]))
     } else {