Merge branch 'main' into 1121_lbls_fmts_utilities@main

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: tern
 Title: Create Common TLGs Used in Clinical Trials
-Version: 0.9.2.9008
+Version: 0.9.2.9009
 Date: 2023-11-06
 Authors@R: c(
     person("Joe", "Zhu", , "[email protected]", role = c("aut", "cre")),

NEWS.md

@@ -1,4 +1,4 @@
-# tern 0.9.2.9008
+# tern 0.9.2.9009
 
 ### New Features
 * Added `ref_group_position` function to place the reference group facet last, first or at a certain position.
@@ -13,6 +13,9 @@
 * Added `annot_coxph_ref_lbls` parameter to `g_km` to enable printing the reference group in table labels when `annot_coxph = TRUE`.
 * Added `x_lab` parameter to `g_lineplot` to customize x-axis label.
 
+### Bug Fixes
+* Fixed bug in `decorate_grob` preventing text wrapping from accounting for font size.
+
 ### Miscellaneous
 * Specified minimal version of package dependencies.
 

R/decorate_grob.R

@@ -132,8 +132,8 @@ decorate_grob <- function(grob,
                           titles,
                           footnotes,
                           page = "",
-                          width_titles = grid::unit(1, "npc") - grid::stringWidth(page),
-                          width_footnotes = grid::unit(1, "npc") - grid::stringWidth(page),
+                          width_titles = grid::unit(1, "npc") - grid::unit(1.5, "cm"),
+                          width_footnotes = grid::unit(1, "npc") - grid::unit(1.5, "cm"),
                           border = TRUE,
                           margins = grid::unit(c(1, 0, 1, 0), "lines"),
                           padding = grid::unit(rep(1, 4), "lines"),
@@ -161,6 +161,14 @@ decorate_grob <- function(grob,
     gp = gp_footnotes
   )
 
+  pg_footnote <- grid::textGrob(
+    paste("\n", page),
+    x = 1, y = 0,
+    just = c("right", "bottom"),
+    vp = grid::viewport(layout.pos.row = 4, layout.pos.col = 1),
+    gp = gp_footnotes
+  )
+
   grid::gTree(
     grob = grob,
     titles = titles,
@@ -194,25 +202,20 @@ decorate_grob <- function(grob,
             )
           ),
           st_footnotes,
-          grid::textGrob(
-            page,
-            x = 1, y = 0,
-            just = c("right", "bottom"),
-            vp = grid::viewport(layout.pos.row = 3, layout.pos.col = 1),
-            gp = gp_footnotes
-          )
+          pg_footnote
         ),
         childrenvp = NULL,
         name = "titles_grob_footnotes",
         vp = grid::vpStack(
           grid::plotViewport(margins = outer_margins),
           grid::viewport(
             layout = grid::grid.layout(
-              nrow = 3, ncol = 1,
+              nrow = 4, ncol = 1,
               heights = grid::unit.c(
                 grid::grobHeight(st_titles),
                 grid::unit(1, "null"),
-                grid::grobHeight(st_footnotes)
+                grid::grobHeight(st_footnotes),
+                grid::grobHeight(pg_footnote)
               )
             )
           )
@@ -325,6 +328,11 @@ split_text_grob <- function(text,
   if (grid::unitType(y) %in% c("sum", "min", "max")) y <- grid::convertUnit(y, default.units)
   if (grid::unitType(width) %in% c("sum", "min", "max")) width <- grid::convertUnit(width, default.units)
 
+  if (length(gp) > 0) { # account for effect of gp on text width
+    width <- width * grid::convertWidth(grid::grobWidth(grid::textGrob(text)), "npc", valueOnly = TRUE) /
+      grid::convertWidth(grid::grobWidth(grid::textGrob(text, gp = gp)), "npc", valueOnly = TRUE)
+  }
+
   ## if it is a fixed unit then we do not need to recalculate when viewport resized
   if (!inherits(width, "unit.arithmetic") && !is.null(attr(width, "unit")) &&
     attr(width, "unit") %in% c("cm", "inches", "mm", "points", "picas", "bigpts", "dida", "cicero", "scaledpts")) { # nolint