fix: longtable, avoid duplicated caption entries

fix #534
davidgohel · May 5, 2023 · c3e3459 · c3e3459
1 parent cb72fb6
commit c3e3459
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: flextable
 Type: Package
 Title: Functions for Tabular Reporting
-Version: 0.9.2.003
+Version: 0.9.2.004
 Authors@R: c(
     person("David", "Gohel", role = c("aut", "cre"),
     email = "[email protected]"),

diff --git a/NEWS.md b/NEWS.md
@@ -7,6 +7,8 @@ This property is used in HTML or LaTeX deps resolution to know
 when to be recursive 
 - `dim_pretty()` returns correct numbers when not 'inches'
 - `as_flextable.table()` now propagates `...` as expected
+- when table was on two pages, there were duplicated caption entries,
+this is fixed thanks to Christophe Dervieux and Nick Bart.
 
 # flextable 0.9.1
 

diff --git a/R/latex_str.R b/R/latex_str.R
@@ -316,7 +316,7 @@ augment_part_separators <- function(z, no_container = TRUE) {
     merge(z[, list(ft_row_id = max(.SD$ft_row_id)), by = "part"],
       data.frame(
         part = factor(c("header", "body", "footer"), levels = c("header", "body", "footer")),
-        part_sep = if(no_container) c("\\endhead", "", "\\endfoot") else c("\\endhead", "", ""),
+        part_sep = if(no_container) c("\\endfirsthead", "", "\\endfoot") else c("\\endfirsthead", "", ""),
         stringsAsFactors = FALSE
       ),
       by = c("part")
@@ -327,6 +327,14 @@ augment_part_separators <- function(z, no_container = TRUE) {
   setorderv(part_separators, c("part", "ft_row_id"))
 
   z <- merge(z, part_separators, by = c("part", "ft_row_id"))
+
+  if ("header" %in% z$part) {
+    z_header <- z[z$part %in% "header",]
+    z_header$ft_row_id <- z_header$ft_row_id + max(z_header$ft_row_id)
+    z_header$part_sep <- "\\endhead"
+    z <- rbind(z[z$part %in% "header",], z_header, z[!z$part %in% "header",])
+  }
+
   z
 }