Merge titles more aggressively (#352)

thomasp85 · Jul 8, 2024 · 3a92584 · 3a92584
1 parent d943757
commit 3a92584
Show file tree

Hide file tree

Showing 2 changed files with 428 additions and 431 deletions.
diff --git a/R/collect_axes.R b/R/collect_axes.R
@@ -251,16 +251,15 @@ grob_id <- function(grobs, layout, byrow, merge = FALSE) {
   hash <- vapply(grobs[idx], function(x) hash(unname_grob(x)), character(1))
 
   # For multi-cell grobs, compute an extra identifier
-  index <- if (byrow) col(layout) else row(layout)
-  min <- ave(index, layout, FUN = min)
-  max <- ave(index, layout, FUN = max)
-  identifier <- paste0(min, ";", max)
-  if (merge) {
-    identifier[min == max] <- ""
+  if (!merge) {
+    index <- if (byrow) col(layout) else row(layout)
+    min <- ave(index, layout, FUN = min)
+    max <- ave(index, layout, FUN = max)
+    identifier <- paste0(min, ";", max)
+    # Include the multi-cell identifier in the hash
+    hash <- paste0(hash, identifier[valid])
   }
 
-  # Include the multi-cell identifier in the hash
-  hash <- paste0(hash, identifier[valid])
   layout[valid] <- match(hash, unique(hash))
   layout
 }