snapshots

vincentarelbundock · Jan 18, 2024 · d3e4fc7 · d3e4fc7
1 parent b9737b2
commit d3e4fc7
Show file tree

Hide file tree

Showing 21 changed files with 105 additions and 98 deletions.
diff --git a/R/format_tt.R b/R/format_tt.R
@@ -35,7 +35,7 @@
 #'  num_mark_big = " ")
 #' tt(tab)
 #'
-format_tt <- function(x = NULL,
+format_tt <- function(x,
                       j = NULL,
                       output = NULL,
                       digits = getOption("digits"),
@@ -52,54 +52,59 @@ format_tt <- function(x = NULL,
                       ) {
 
   out <- x
-  cal <- call("format_tt_lazy", 
-              j = j,
-              output = output,
-              digits = digits,
-              num_fmt = num_fmt,
-              num_zero = num_zero,
-              num_suffix = num_suffix,
-              num_mark_big = num_mark_big,
-              num_mark_dec = num_mark_dec,
-              sprintf = sprintf,
-              url = url,
-              date = date,
-              bool = bool,
-              other = other)
 
   if (inherits(out, "tinytable")) {
+    cal <- call("format_tt_lazy", 
+                j = j,
+                output = output,
+                digits = digits,
+                num_fmt = num_fmt,
+                num_zero = num_zero,
+                num_suffix = num_suffix,
+                num_mark_big = num_mark_big,
+                num_mark_dec = num_mark_dec,
+                sprintf = sprintf,
+                url = url,
+                date = date,
+                bool = bool,
+                other = other)
     out <- meta(out, "lazy_format", c(meta(out)$lazy_format, list(cal)))
-
-  # this should be evaluated immediately for data frames and vectors
   } else {
-    cal[["x"]] <- x
-    out <- eval(out)
-  }
 
+    out <- format_tt_lazy(out,
+                          j = j,
+                          output = output,
+                          digits = digits,
+                          num_fmt = num_fmt,
+                          num_zero = num_zero,
+                          num_suffix = num_suffix,
+                          num_mark_big = num_mark_big,
+                          num_mark_dec = num_mark_dec,
+                          sprintf = sprintf,
+                          url = url,
+                          date = date,
+                          bool = bool,
+                          other = other)
+  }
   return(out)
 }
 
 format_tt_lazy <- function(x,
-                           j,
-                           output,
+                           j = NULL,
+                           output = NULL ,
                            digits,
-                           num_fmt,
-                           num_zero,
-                           num_suffix,
-                           num_mark_big,
-                           num_mark_dec,
-                           sprintf,
-                           url,
-                           date,
-                           bool,
-                           other
+                           num_fmt = "significant",
+                           num_zero = FALSE,
+                           num_suffix = FALSE,
+                           num_mark_big = "",
+                           num_mark_dec = NULL,
+                           sprintf = NULL,
+                           url = FALSE,
+                           date = "%Y-%m-%d",
+                           bool = identity,
+                           other = identity
                            ) {
 
-
-  if (inherits(x, "tinytable")) {
-    msg <- "`format_tt()` must be called *before* `tt()`. You must format your dataset before drawing a table."
-  }
-
   if (isTRUE(check_atomic_vector(x))) {
     atomic_vector <- TRUE
     x <- data.frame(tinytable = x)
@@ -138,7 +143,6 @@ format_tt_lazy <- function(x,
 
   # format each column
   for (col in j) {
-
     # sprintf() is self-contained
     if (!is.null(sprintf)) {
       x[[col]] <- base::sprintf(sprintf, x[[col]])

diff --git a/R/tt.R b/R/tt.R
@@ -35,7 +35,7 @@
 #' @export
 tt <- function(x,
                output = NULL,
-               digits = getOption("digits"),
+               digits = NULL,
                caption = NULL,
                width = NULL,
                notes = NULL,
@@ -49,10 +49,6 @@ tt <- function(x,
   assert_numeric(width, len = 1, lower = 0, upper = 1, null.ok = TRUE)
   assert_integerish(digits, len = 1, null.ok = TRUE)
 
-  # formatting options are limited here
-  if (!is.null(digits)) {
-    x <- format_tt(x, digits = digits)
-  }
 
   # notes can be a single string or a (named) list of strings
   if (is.character(notes) && length(notes)) {
@@ -86,5 +82,11 @@ tt <- function(x,
 
   out <- meta(out, "lazy_tt", cal)
 
+  # formatting options are limited here
+  # after creating the table since the new lazy system
+  if (!is.null(digits)) {
+    out <- format_tt(out, digits = digits)
+  }
+
   return(out)
 }
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
 
-
 <p align="center">
 <img src="man/figures/tinytable_logo.svg" height = "250" class = "center">
 </p>

diff --git a/inst/tinytest/_tinysnapshot/html-striped.rds b/inst/tinytest/_tinysnapshot/html-striped.rds
diff --git a/inst/tinytest/_tinysnapshot/html-striped_orange.rds b/inst/tinytest/_tinysnapshot/html-striped_orange.rds
diff --git a/inst/tinytest/_tinysnapshot/html-vectorized_color_j.rds b/inst/tinytest/_tinysnapshot/html-vectorized_color_j.rds
diff --git a/inst/tinytest/_tinysnapshot/latex-align.txt b/inst/tinytest/_tinysnapshot/latex-align.txt
@@ -13,9 +13,9 @@ column{5}={halign=r,},
 }                     %% tabularray inner close
 \toprule
 mpg & cyl & disp & hp & drat \\ \midrule %% TinyTableHeader
-21.0 & 6 & 160 & 110 & 3.90 \\
-21.0 & 6 & 160 & 110 & 3.90 \\
-22.8 & 4 & 108 &  93 & 3.85 \\
+21 & 6 & 160 & 110 & 3.9 \\
+21 & 6 & 160 & 110 & 3.9 \\
+22.8 & 4 & 108 & 93 & 3.85 \\
 21.4 & 6 & 258 & 110 & 3.08 \\
 \bottomrule
 \end{tblr}

diff --git a/inst/tinytest/_tinysnapshot/latex-cell_color.txt b/inst/tinytest/_tinysnapshot/latex-cell_color.txt
@@ -16,9 +16,9 @@ cell{3}{4}={}{,fg=orange,},
 }                     %% tabularray inner close
 \toprule
 mpg & cyl & disp & hp & drat \\ \midrule %% TinyTableHeader
-21.0 & 6 & 160 & 110 & 3.90 \\
-21.0 & 6 & 160 & 110 & 3.90 \\
-22.8 & 4 & 108 &  93 & 3.85 \\
+21 & 6 & 160 & 110 & 3.9 \\
+21 & 6 & 160 & 110 & 3.9 \\
+22.8 & 4 & 108 & 93 & 3.85 \\
 21.4 & 6 & 258 & 110 & 3.08 \\
 \bottomrule
 \end{tblr}

diff --git a/inst/tinytest/_tinysnapshot/latex-col_color.txt b/inst/tinytest/_tinysnapshot/latex-col_color.txt
@@ -12,9 +12,9 @@ column{4}={,fg=orange,},
 }                     %% tabularray inner close
 \toprule
 mpg & cyl & disp & hp & drat \\ \midrule %% TinyTableHeader
-21.0 & 6 & 160 & 110 & 3.90 \\
-21.0 & 6 & 160 & 110 & 3.90 \\
-22.8 & 4 & 108 &  93 & 3.85 \\
+21 & 6 & 160 & 110 & 3.9 \\
+21 & 6 & 160 & 110 & 3.9 \\
+22.8 & 4 & 108 & 93 & 3.85 \\
 21.4 & 6 & 258 & 110 & 3.08 \\
 \bottomrule
 \end{tblr}

diff --git a/inst/tinytest/_tinysnapshot/latex-default.txt b/inst/tinytest/_tinysnapshot/latex-default.txt
@@ -5,13 +5,12 @@
 ]                     %% tabularray outer close
 {                     %% tabularray inner open
 colspec={Q[]Q[]Q[]Q[]Q[]},
-row{even}={bg=black!5!white},
 }                     %% tabularray inner close
 \toprule
 mpg & cyl & disp & hp & drat \\ \midrule %% TinyTableHeader
-21.0 & 6 & 160 & 110 & 3.90 \\
-21.0 & 6 & 160 & 110 & 3.90 \\
-22.8 & 4 & 108 &  93 & 3.85 \\
+21 & 6 & 160 & 110 & 3.9 \\
+21 & 6 & 160 & 110 & 3.9 \\
+22.8 & 4 & 108 & 93 & 3.85 \\
 21.4 & 6 & 258 & 110 & 3.08 \\
 \bottomrule
 \end{tblr}

diff --git a/inst/tinytest/_tinysnapshot/latex-group_style_order.txt b/inst/tinytest/_tinysnapshot/latex-group_style_order.txt
@@ -5,19 +5,19 @@
 ]                     %% tabularray outer close
 {                     %% tabularray inner open
 colspec={Q[]Q[]Q[]Q[]},
+cell{1}{1}={c=2,}{halign=c,},
+cell{1}{3}={c=2,}{halign=c,},
 row{3}={,bg=black,fg=orange,},
 row{4}={,bg=black,fg=orange,},
 row{5}={,bg=black,fg=orange,},
 row{6}={,bg=black,fg=orange,},
-cell{1}{1}={c=2,}{halign=c,},
-cell{1}{3}={c=2,}{halign=c,},
 }                     %% tabularray inner close
 \toprule
 blah &  & bar &  \\ \cmidrule[lr]{1-2}\cmidrule[lr]{3-4}
 mpg & cyl & disp & hp \\ \midrule %% TinyTableHeader
-21.0 & 6 & 160 & 110 \\
-21.0 & 6 & 160 & 110 \\
-22.8 & 4 & 108 &  93 \\
+21 & 6 & 160 & 110 \\
+21 & 6 & 160 & 110 \\
+22.8 & 4 & 108 & 93 \\
 21.4 & 6 & 258 & 110 \\
 \bottomrule
 \end{tblr}

diff --git a/inst/tinytest/_tinysnapshot/latex-nohead.txt b/inst/tinytest/_tinysnapshot/latex-nohead.txt
@@ -7,9 +7,9 @@
 colspec={Q[]Q[]Q[]Q[]Q[]},
 }                     %% tabularray inner close
 \toprule
-21.0 & 6 & 160 & 110 & 3.90 \\
-21.0 & 6 & 160 & 110 & 3.90 \\
-22.8 & 4 & 108 &  93 & 3.85 \\
+21 & 6 & 160 & 110 & 3.9 \\
+21 & 6 & 160 & 110 & 3.9 \\
+22.8 & 4 & 108 & 93 & 3.85 \\
 21.4 & 6 & 258 & 110 & 3.08 \\
 \bottomrule
 \end{tblr}

diff --git a/inst/tinytest/_tinysnapshot/latex-row_color.txt b/inst/tinytest/_tinysnapshot/latex-row_color.txt
@@ -12,9 +12,9 @@ row{5}={,fg=orange,},
 }                     %% tabularray inner close
 \toprule
 mpg & cyl & disp & hp & drat \\ \midrule %% TinyTableHeader
-21.0 & 6 & 160 & 110 & 3.90 \\
-21.0 & 6 & 160 & 110 & 3.90 \\
-22.8 & 4 & 108 &  93 & 3.85 \\
+21 & 6 & 160 & 110 & 3.9 \\
+21 & 6 & 160 & 110 & 3.9 \\
+22.8 & 4 & 108 & 93 & 3.85 \\
 21.4 & 6 & 258 & 110 & 3.08 \\
 \bottomrule
 \end{tblr}

diff --git a/inst/tinytest/_tinysnapshot/latex-theme_grid.txt b/inst/tinytest/_tinysnapshot/latex-theme_grid.txt
@@ -9,9 +9,9 @@ colspec={Q[]Q[]Q[]Q[]Q[]},
 hlines={},vlines={},
 }                     %% tabularray inner close
 mpg & cyl & disp & hp & drat \\
-21.0 & 6 & 160 & 110 & 3.90 \\
-21.0 & 6 & 160 & 110 & 3.90 \\
-22.8 & 4 & 108 &  93 & 3.85 \\
+21 & 6 & 160 & 110 & 3.9 \\
+21 & 6 & 160 & 110 & 3.9 \\
+22.8 & 4 & 108 & 93 & 3.85 \\
 21.4 & 6 & 258 & 110 & 3.08 \\
 \end{tblr}
 \end{table}
diff --git a/inst/tinytest/_tinysnapshot/latex-theme_striped.txt b/inst/tinytest/_tinysnapshot/latex-theme_striped.txt
@@ -9,9 +9,9 @@ row{even}={bg=black!5!white},
 }                     %% tabularray inner close
 \toprule
 mpg & cyl & disp & hp & drat \\ \midrule %% TinyTableHeader
-21.0 & 6 & 160 & 110 & 3.90 \\
-21.0 & 6 & 160 & 110 & 3.90 \\
-22.8 & 4 & 108 &  93 & 3.85 \\
+21 & 6 & 160 & 110 & 3.9 \\
+21 & 6 & 160 & 110 & 3.9 \\
+22.8 & 4 & 108 & 93 & 3.85 \\
 21.4 & 6 & 258 & 110 & 3.08 \\
 \bottomrule
 \end{tblr}

diff --git a/inst/tinytest/_tinysnapshot/latex-theme_void.txt b/inst/tinytest/_tinysnapshot/latex-theme_void.txt
@@ -7,9 +7,9 @@
 colspec={Q[]Q[]Q[]Q[]Q[]},
 }                     %% tabularray inner close
 mpg & cyl & disp & hp & drat \\
-21.0 & 6 & 160 & 110 & 3.90 \\
-21.0 & 6 & 160 & 110 & 3.90 \\
-22.8 & 4 & 108 &  93 & 3.85 \\
+21 & 6 & 160 & 110 & 3.9 \\
+21 & 6 & 160 & 110 & 3.9 \\
+22.8 & 4 & 108 & 93 & 3.85 \\
 21.4 & 6 & 258 & 110 & 3.08 \\
 \end{tblr}
 \end{table}
diff --git a/inst/tinytest/_tinysnapshot/markdown-nocolnames.txt b/inst/tinytest/_tinysnapshot/markdown-nocolnames.txt
@@ -1,11 +1,11 @@
 
 | 5.1 | 3.5 | 1.4 | 0.2 | setosa | 
-| 4.9 | 3.0 | 1.4 | 0.2 | setosa | 
+| 4.9 | 3   | 1.4 | 0.2 | setosa | 
 | 4.7 | 3.2 | 1.3 | 0.2 | setosa | 
 | 4.6 | 3.1 | 1.5 | 0.2 | setosa | 
-| 5.0 | 3.6 | 1.4 | 0.2 | setosa | 
+| 5   | 3.6 | 1.4 | 0.2 | setosa | 
 | 5.4 | 3.9 | 1.7 | 0.4 | setosa | 
 | 4.6 | 3.4 | 1.4 | 0.3 | setosa | 
-| 5.0 | 3.4 | 1.5 | 0.2 | setosa | 
+| 5   | 3.4 | 1.5 | 0.2 | setosa | 
 | 4.4 | 2.9 | 1.4 | 0.2 | setosa | 
 | 4.9 | 3.1 | 1.5 | 0.1 | setosa | 
diff --git a/inst/tinytest/test-latex.R b/inst/tinytest/test-latex.R
@@ -4,7 +4,7 @@ using("tinysnapshot")
 x <- mtcars[1:4, 1:5]
 
 expect_snapshot_print(
-  tt(x, output = "latex", theme = "striped"),
+  tt(x, output = "latex"),
   label = "latex-default")
 
 k <- x

diff --git a/man/format_tt.Rd b/man/format_tt.Rd
diff --git a/man/tt.Rd b/man/tt.Rd