merge main

Author: olivroy

CITATION.cff

@@ -3,7 +3,7 @@ message: 'If you wish to cite the "gt" package use:'
 type: software
 license: MIT
 title: 'gt: Easily Create Presentation-Ready Display Tables'
-version: 0.10.1
+version: 0.11.0
 abstract: Build display tables from tabular data with an easy-to-use set of functions.
   With its progressive approach, we can construct display tables with a cohesive set
   of table parts. Table values can be formatted using any of the included formatting
@@ -34,7 +34,13 @@ authors:
   given-names: JooYoung
   email: [email protected]
   orcid: https://orcid.org/0000-0002-4064-6012
-repository: https://CRAN.R-project.org/package=gt
+- family-names: Ken
+  given-names: Brevoort
+  email: [email protected]
+  orcid: https://orcid.org/0000-0002-4001-8358
+- family-names: Olivier
+  given-names: Roy
+repository: https://doi.org/10.32614/CRAN.package.gt
 repository-code: https://github.com/rstudio/gt
 url: https://gt.rstudio.com
 contact:

R/cols_align_decimal.R

@@ -173,7 +173,7 @@ cols_align_decimal <- function(
 # helper -----------------------------------
 align_to_char <- function(x, align_at = ".") {
 
-  na_x_vals <- grepl("^NA$", x)
+  na_x_vals <- x == "NA"
   no_a_char <- !grepl(align_at, x, fixed = TRUE) & !grepl("[0-9]", x)
   has_t_dec <- grepl("[0-9]\\.$", x)
 
@@ -225,7 +225,7 @@ align_to_char <- function(x, align_at = ".") {
 
       x_piece_rhs[i] <-
         gsub(
-          paste0(paste(rep("\U02007", n_char_extracted), collapse = ""), "$"),
+          paste0(strrep("\U02007", n_char_extracted), "$"),
           "",
           x_piece_rhs[i]
         )
@@ -238,15 +238,15 @@ align_to_char <- function(x, align_at = ".") {
 
   if (grepl(align_at, paste(x[!x_no_align], collapse = "|"), fixed = TRUE)) {
 
-    x_align[!nchar(x_rhs) > 0 & !grepl(align_at, x[!x_no_align], fixed = TRUE)] <-
-      sub(align_at, " ", x_align[!nchar(x_rhs) > 0], fixed = TRUE)
+    x_align[nchar(x_rhs) == 0 & !grepl(align_at, x[!x_no_align], fixed = TRUE)] <-
+      sub(align_at, " ", x_align[nchar(x_rhs) == 0], fixed = TRUE)
 
     x_align[x_align_parens] <- paste0(x_align[x_align_parens], "\U000A0")
 
   } else {
 
-    x_align[!nchar(x_rhs) > 0 & !grepl(align_at, x[!x_no_align], fixed = TRUE)] <-
-      sub(align_at, "", x_align[!nchar(x_rhs) > 0], fixed = TRUE)
+    x_align[nchar(x_rhs) == 0 & !grepl(align_at, x[!x_no_align], fixed = TRUE)] <-
+      sub(align_at, "", x_align[nchar(x_rhs) == 0], fixed = TRUE)
 
     x_align[!x_align_parens] <- paste0(x_align[!x_align_parens], "\U000A0")
   }

R/cols_merge.R

@@ -245,7 +245,7 @@ cols_merge <- function(
 
     hide_columns_from_supplied <- base::intersect(hide_columns, columns)
 
-    if (length(base::setdiff(hide_columns, columns) > 0)) {
+    if (length(base::setdiff(hide_columns, columns)) > 0) {
       cli::cli_warn(c(
         "Only a subset of columns supplied in `columns` will be hidden.",
         "*" = "Use an additional `cols_hide()` expression to hide any

R/compile_scss.R

@@ -36,7 +36,7 @@ compile_scss <- function(data, id = NULL) {
   gt_options_tbl <-
     within(
       gt_options_tbl, {
-        value[color_rows] = value[color_rows] <-
+        value[color_rows] <- value[color_rows] <-
           lapply(value[color_rows], html_color)
       }
     )

R/export.R

@@ -927,7 +927,7 @@ grid_align_gtable <- function(gtable, data) {
 
     left <- grid::unit(0.5, "null")
 
-  } else if (grepl("\\%$", left)) {
+  } else if (endsWith(left, "%")) {
 
     left <- as.numeric(sub("\\%$", "", left)) / 100
     left <- grid::unit(left * 0.5, "null")
@@ -941,7 +941,7 @@ grid_align_gtable <- function(gtable, data) {
 
     right <- grid::unit(0.5, "null")
 
-  } else if (grepl("\\%$", right)) {
+  } else if (endsWith(right, "%")) {
 
     right <- as.numeric(sub("\\%$", "", right)) / 100
     right <- grid::unit(right * 0.5, "null")
@@ -1005,7 +1005,7 @@ grid_layout_widths <- function(layout, data) {
 
   total_width <- dt_options_get_value(data, "table_width")
 
-  if (grepl("px$", total_width)) {
+  if (endsWith(total_width, "px")) {
 
     total_width <- parse_px_to_pt(total_width)
     extra_width <- total_width - sum(widths)
@@ -1023,7 +1023,7 @@ grid_layout_widths <- function(layout, data) {
     return(widths)
   }
 
-  if (grepl("\\%$", total_width)) {
+  if (endsWith(total_width, "%")) {
 
     # Set the total width in npc units
     total_width <- as.numeric(sub("\\%$", "", total_width)) / 100

R/fmt.R

@@ -635,7 +635,7 @@ format_num_to_str <- function(
     is_inf <- grepl("Inf", x_str, fixed = TRUE)
     x_str_numeric <- x_str[!is_inf]
     has_decimal <- grepl(".", x_str_numeric, fixed = TRUE)
-    is_negative <- grepl("^-", x_str_numeric)
+    is_negative <- startsWith(x_str_numeric, "-")
 
     integer_parts <- sub("\\..*", "", x_str_numeric)
 
@@ -757,23 +757,22 @@ to_latex_math_mode <- function(x, context) {
 
     return(x)
 
-  } else {
-
-    # Ensure that `$` signs only surround the correct number parts
-    # - certain LaTeX marks operate only in text mode and we need to
-    #   conditionally surround only the number portion in these cases
-    # - right now, the only marks that need to be situated outside of
-    #   the math context are the per mille and per myriad (10,000)
-    #   marks (provided by the `fmt_per()` function)
-    if (all(grepl("\\\\textper(ten)?thousand$", x))) {
-      out <- paste0("$", x)
-      out <- gsub("(\\s*?\\\\textper(ten)?thousand)", "$\\1", out)
-    } else {
-      out <- paste_between(x, x_2 = c("$", "$"))
-    }
+  }
 
-    return(out)
+  # Ensure that `$` signs only surround the correct number parts
+  # - certain LaTeX marks operate only in text mode and we need to
+  #   conditionally surround only the number portion in these cases
+  # - right now, the only marks that need to be situated outside of
+  #   the math context are the per mille and per myriad (10,000)
+  #   marks (provided by the `fmt_per()` function)
+  if (all(grepl("\\\\textper(ten)?thousand$", x))) {
+    out <- paste0("$", x)
+    out <- gsub("(\\s*?\\\\textper(ten)?thousand)", "$\\1", out)
+  } else {
+    out <- paste_between(x, x_2 = c("$", "$"))
   }
+
+  return(out)
 }
 
 #' Obtain the contextually correct minus mark

R/format_data.R

@@ -2369,7 +2369,7 @@ fmt_fraction <- function(
 
 gcd <- function(x,y) {
   r <- x %% y
-  return(ifelse(r, gcd(y, r), y))
+  ifelse(r, gcd(y, r), y)
 }
 
 make_frac <- function(x, denom, simplify = TRUE) {
@@ -7114,7 +7114,7 @@ fmt_tf <- function(
     # If using SVG graphics for either of `true_val` or `false_val` then
     # we'd prefer to have center alignment of the icons
     if (
-      grepl("^<svg ", true_val) || grepl("^<svg ", false_val)
+      startsWith(true_val, "<svg ") || startsWith(false_val, "<svg ")
     ) {
       alignment <- "center"
     }
@@ -8263,7 +8263,7 @@ fmt_url <- function(
         target <- target %||% "_blank"
         target_values <- NULL
 
-        if (grepl("^_", target)) {
+        if (startsWith(target, "_")) {
           target_values <- c("_blank", "_self", "_parent", "_top")
         }
 
@@ -8951,7 +8951,7 @@ fmt_email <- function(
         target <- target %||% "_blank"
         target_values <- NULL
 
-        if (grepl("^_", target)) {
+        if (startsWith(target, "_")) {
           target_values <- c("_blank", "_self", "_parent", "_top")
         }
 
@@ -9018,9 +9018,8 @@ fmt_email <- function(
                   label_separated <- unlist(strsplit(label_str, " "))
 
                 } else if (
-                  grepl("^<", label_str) &&
-                  grepl(">$", label_str) &&
-                  !grepl("^<svg", label_str)
+                  grepl("^<.*>$", label_str) &&
+                  !startsWith(label_str, "<svg")
                 ) {
 
                   label_separated <- unlist(strsplit(label_str, ">\\s*<"))

R/helpers.R

@@ -1114,7 +1114,7 @@ cells_title <- function(groups = c("title", "subtitle")) {
     !is.character(groups) ||
     length(groups) < 1 ||
     !all(groups %in% c("title", "subtitle")) ||
-    any(duplicated(groups))
+    anyDuplicated(groups) > 0L
   ) {
     cli::cli_abort(
       "`groups` must be either {.val title}, {.val subtitle}, or both."

R/opts.R

@@ -1174,9 +1174,9 @@ opt_all_caps <- function(
 
     values_vec <-
       dplyr::case_when(
-        grepl("\\.font\\.size$", options_vec) ~ "80%",
-        grepl("\\.font\\.weight$", options_vec) ~ "bolder",
-        grepl("\\.text_transform$", options_vec) ~ "uppercase"
+        endsWith(options_vec, ".font.size") ~ "80%",
+        endsWith(options_vec, ".font.weight") ~ "bolder",
+        endsWith(options_vec, ".text_transform") ~ "uppercase"
       )
 
     option_value_list <- create_option_value_list(options_vec, values_vec)

R/render_as_i_html.R

@@ -190,13 +190,15 @@ render_as_ihtml <- function(data, id) {
   column_labels_border_bottom_color <- opt_val(data = data, option = "column_labels_border_bottom_color")
 
   # Don't allow NA
-  column_labels_background_color = opt_val(data = data, option = "column_labels_background_color")
+  column_labels_background_color <- opt_val(data = data, option = "column_labels_background_color")
   if (is.na(column_labels_background_color)) {
     # apply all column labels formatting to both heading + groupCol styling (nothing specific for spanners styling in gt?)
     column_labels_background_color <- "transparent"
   }
 
   column_labels_font_weight <- opt_val(data = data, option = "column_labels_font_weight")
+  # Apply stub font weight to
+  stub_font_weight <- opt_val(data = data, option = "stub_font_weight")
   # Apply font weight to groupname_col title
   row_group_font_weight <-  opt_val(data = data, "row_group_font_weight")
   row_group_background_color <- opt_val(data = data, "row_group_background_color")
@@ -215,7 +217,6 @@ render_as_ihtml <- function(data, id) {
   all_borders <- horizontal_borders != "none" && veritcal_borders != "none"
 
   # for row names + summary label
-  stub_font_weight <- opt_val(data = data, "stub_font_weight")
   stub_border_color <- opt_val(data, "stub_border_color")
   stub_border_style <- opt_val(data, "stub_border_style")
   # Apply stub font weight to