Merge branch 'master' into latex_stub_separator

Author: rich-iannone

R/utils_render_latex.R

@@ -1464,13 +1464,15 @@ create_body_rows_l <- function(
 ) {
 
   styles_tbl <- dt_styles_get(data = data)
-  styles_tbl <- vctrs::vec_slice(styles_tbl, styles_tbl$locname %in% c("stub", "data", "row_groups"))
+  styles_tbl <- vctrs::vec_slice(
+    styles_tbl,
+    styles_tbl$locname %in% c("stub", "stub_column", "data", "row_groups")
+  )
 
   # Obtain all of the visible (`"default"`), non-stub column names
   # for the table from the `boxh` object
   default_vars <- dt_boxhead_get_vars_default(data = data)
 
-
   stub_layout <- get_stub_layout(data = data)
 
   stub_is_2 <- length(stub_layout) > 1L
@@ -1479,17 +1481,27 @@ create_body_rows_l <- function(
   stub_vars <- dt_boxhead_get_var_stub(data = data)
   n_stub_cols <- if (length(stub_vars) == 1 && is.na(stub_vars)) 0 else length(stub_vars)
 
+  # For multi-column stubs, use actual column names as placeholders to enable
+  # per-column styling; for single-column stubs, use ::stub:: for backward compat
   if (is.null(stub_layout)) {
     vars <- default_vars
   } else if (!is.null(stub_layout) && !stub_is_2 && stub_layout == "rowname") {
-    # Create a ::stub:: placeholder for each stub column
-    vars <- c(rep("::stub::", n_stub_cols), default_vars)
+    # Use actual stub column names as placeholders for proper style targeting
+    if (n_stub_cols > 1) {
+      vars <- c(paste0("::stub_", stub_vars, "::"), default_vars)
+    } else {
+      vars <- c("::stub::", default_vars)
+    }
   } else if (!is.null(stub_layout) && !stub_is_2 && stub_layout == "group_label") {
     vars <- c("::group::", default_vars)
   } else if (!is.null(stub_layout) && stub_is_2) {
     # When we have both group_label and rowname columns
-    # Create a ::stub:: placeholder for each stub column, plus the group column
-    vars <- c("::group::", rep("::stub::", n_stub_cols), default_vars)
+    # Use actual stub column names as placeholders for proper style targeting
+    if (n_stub_cols > 1) {
+      vars <- c("::group::", paste0("::stub_", stub_vars, "::"), default_vars)
+    } else {
+      vars <- c("::group::", "::stub::", default_vars)
+    }
   }
 
   if ("::group::" %in% vars) {
@@ -1537,11 +1549,40 @@ create_body_rows_l <- function(
               } else if (
                 !is.na(colname_i) &&
                 colname_i == "::stub::" &&
-                "stub" %in% styles_tbl_i[["locname"]]
+                any(c("stub", "stub_column") %in% styles_tbl_i[["locname"]])
               ) {
 
-                styles_tbl_i_col <- vctrs::vec_slice(styles_tbl_i, styles_tbl_i$locname == "stub")
-                #styles_i_col <- styles_tbl_i_col[["styles"]]
+                # For single-column stubs, check both "stub" and "stub_column" locnames
+                styles_tbl_i_col <- vctrs::vec_slice(
+                  styles_tbl_i,
+                  styles_tbl_i$locname %in% c("stub", "stub_column")
+                )
+
+              } else if (
+                !is.na(colname_i) &&
+                grepl("^::stub_.*::$", colname_i) &&
+                any(c("stub", "stub_column") %in% styles_tbl_i[["locname"]])
+              ) {
+
+                # For multi-column stubs with named placeholders (e.g., ::stub_group::)
+                # Extract the actual column name from the placeholder
+                actual_col <- gsub("^::stub_(.*)::$", "\\1", colname_i)
+
+                # Get styles for this specific stub column (stub_column locname)
+                # or fall back to general stub styles
+                stub_col_styles <- vctrs::vec_slice(
+                  styles_tbl_i,
+                  styles_tbl_i$locname == "stub_column" &
+                    styles_tbl_i$colname == actual_col
+                )
+                general_stub_styles <- vctrs::vec_slice(
+                  styles_tbl_i,
+                  styles_tbl_i$locname == "stub"
+                )
+                styles_tbl_i_col <- vctrs::vec_rbind(
+                  stub_col_styles,
+                  general_stub_styles
+                )
 
               } else if (
                 "data" %in% styles_tbl_i[["locname"]] &&
@@ -1560,17 +1601,20 @@ create_body_rows_l <- function(
 
                 styles_body <- consolidate_cell_styles_l(styles_tbl_i_col)
 
-                if(identical(colname_i,"::stub::")){
+                if (
+                  identical(colname_i, "::stub::") ||
+                  grepl("^::stub_.*::$", colname_i)
+                ) {
                   colwidth_i <- dplyr::filter(
                     colwidth_df,
                     type == "stub",
                   )[i, ]
 
-                }else{
+                } else {
                   colwidth_i <- dplyr::filter(
                     colwidth_df,
                     var == colname_i
-                    )
+                  )
                 }
 
                 if(sum(colwidth_i$unspec < 1) > 0){
@@ -1588,13 +1632,16 @@ create_body_rows_l <- function(
 
               } else {
 
-                if(identical(colname_i,"::stub::")){
+                if (
+                  identical(colname_i, "::stub::") ||
+                  grepl("^::stub_.*::$", colname_i)
+                ) {
                   colwidth_i <- dplyr::filter(
                     colwidth_df,
                     type == "stub",
                   )[i, ]
 
-                }else{
+                } else {
                   colwidth_i <- dplyr::filter(
                     colwidth_df,
                     var == colname_i

tests/testthat/test-multicolumn_stub_latex.R

@@ -702,3 +702,81 @@ test_that("tab_stubhead() with styles works in LaTeX multicolumn stub", {
   expect_true(grepl("Model", latex_output))
   expect_true(grepl("Trim", latex_output))
 })
+
+test_that("cells_stub() alignment styles work in LaTeX multicolumn stub", {
+
+  # Regression test for LaTeX alignment in multi-column stubs
+  # cells_stub() should apply alignment to all stub columns in LaTeX output
+  gt_tbl <-
+    exibble |>
+    gt(rowname_col = c("group", "char")) |>
+    tab_style(
+      style = list(cell_text(align = "right")),
+      locations = list(cells_stub())
+    )
+
+  latex_output <- as.character(as_latex(gt_tbl))
+
+  # Both stub columns should have right alignment applied via \multicolumn{1}{r}
+  # Count occurrences of right-aligned multicolumn for stub cells
+  # Each row should have 2 right-aligned stub cells (group and char columns)
+  right_align_count <- length(
+    gregexpr("\\\\multicolumn\\{1\\}\\{r\\}", latex_output)[[1]]
+  )
+
+ # 8 rows * 2 stub columns = 16 right-aligned cells
+  expect_gte(right_align_count, 16)
+
+  # Verify specific content is right-aligned
+  expect_true(grepl("\\\\multicolumn\\{1\\}\\{r\\}\\{\\{grp\\\\_a\\}\\}", latex_output))
+  expect_true(grepl("\\\\multicolumn\\{1\\}\\{r\\}\\{\\{apricot\\}\\}", latex_output))
+
+  # Test with explicit columns = NULL (should behave the same)
+  gt_tbl_null <-
+    exibble |>
+    gt(rowname_col = c("group", "char")) |>
+    tab_style(
+      style = list(cell_text(align = "right")),
+      locations = list(cells_stub(columns = NULL))
+    )
+
+  latex_output_null <- as.character(as_latex(gt_tbl_null))
+
+  # Should also have right alignment for both columns
+  right_align_count_null <- length(
+    gregexpr("\\\\multicolumn\\{1\\}\\{r\\}", latex_output_null)[[1]]
+  )
+  expect_gte(right_align_count_null, 16)
+})
+
+test_that("cells_stub() footnotes work in LaTeX multicolumn stub", {
+
+  # Regression test for LaTeX footnotes in multi-column stubs
+  # cells_stub() should apply footnotes to all stub columns in LaTeX output
+
+  gt_tbl <-
+    head(exibble, 4) |>
+    gt(rowname_col = c("group", "char")) |>
+    tab_footnote(
+      footnote = "Test",
+      locations = cells_stub()
+    )
+
+  latex_output <- as.character(as_latex(gt_tbl))
+
+  # Should render without error
+  expect_no_error(as_latex(gt_tbl))
+
+  # Footnote text should appear in the output
+  expect_true(grepl("Test", latex_output))
+
+  # Footnote marks should be present in stub cells
+  # Due to hierarchical stub merging: 1 mark for "grp_a" in the group column
+  # (subsequent group rows are empty) + 4 marks for the char column
+  # (apricot, banana, coconut, durian) = 5 marks in cells + 1 in footnote section
+  # The format is \textsuperscript{\textit{1}}
+  footnote_mark_count <- length(
+    gregexpr("\\\\textsuperscript\\{\\\\textit\\{1\\}\\}", latex_output)[[1]]
+  )
+  expect_equal(footnote_mark_count, 6)
+})