bug fix #174

divided from 0 instead of 1 to allow first page to have same number of rows.

R/as_rtf_pageby.R

@@ -95,30 +95,17 @@ as_rtf_pageby <- function(tbl) {
     page_dict$id <- factor(page_dict$id, levels = unique(page_dict$id))
   }
 
-  # Define page number for each row
-  page_dict_page <- function(page_dict) {
-    # Page Number
-    page <- cumsum(page_dict$nrow) %/% page_dict$total
-
-    # If the last row is a page by row, move it to next row
-    retain <- unlist(lapply(split(page_dict, page), function(x) {
-      rev(cumsum(rev(x$pageby)) == seq_len(nrow(x)))
-    }))
-
-    page + retain + 1
-  }
-
   ## Adjust page number if pageby$new_page is true
   new_page <- pageby$new_page | attr(tbl, "rtf_by_subline")$new_page
   if (new_page) {
     if (pageby$new_page) page_id <- page_dict$page_id
     if (attr(tbl, "rtf_by_subline")$new_page) page_id <- page_dict$subline
     if (pageby$new_page & attr(tbl, "rtf_by_subline")$new_page) page_id <- page_dict$id
 
-    page_dict$page <- unlist(lapply(split(page_dict, page_id), page_dict_page))
+    page_dict$page <- unlist(lapply(split(page_dict, page_id), pageby_dict_page))
     page_dict$page <- as.numeric(page_id) * 1e6 + page_dict$page
   } else {
-    page_dict$page <- page_dict_page(page_dict)
+    page_dict$page <- pageby_dict_page(page_dict)
   }
 
   page_dict$index <- cumsum(!page_dict$pageby)
@@ -295,3 +282,16 @@ as_rtf_pageby <- function(tbl) {
   attr(rtf, "info") <- page_dict
   rtf
 }
+
+# Define page number for each row
+pageby_dict_page <- function(page_dict) {
+  # Page Number
+  page <- (cumsum(page_dict$nrow) - 1) %/% page_dict$total
+
+  # If the last row is a page by row, move it to next row
+  retain <- unlist(lapply(split(page_dict, page), function(x) {
+    rev(cumsum(rev(x$pageby)) == seq_len(nrow(x)))
+  }))
+
+  page + retain + 1
+}

R/as_rtf_table.R

@@ -76,21 +76,13 @@ as_rtf_table <- function(tbl) {
     stringsAsFactors = FALSE
   )
 
-  # Define page number for each row
-  page_dict_page <- function(page_dict) {
-    # Page Number
-    page <- cumsum(page_dict$nrow) %/% page_dict$total
-
-    page + 1
-  }
-
   if (!is.null(attr(tbl, "rtf_by_subline")$id)) {
     page_dict$id <- attr(tbl, "rtf_by_subline")$id
     page_dict$subline <- attr(tbl, "rtf_by_subline")$id
     page_dict$page <- unlist(lapply(split(page_dict, page_dict$id), page_dict_page))
     page_dict$page <- as.numeric(page_dict$id) * 1e6 + page_dict$page
   } else {
-    page_dict$page <- with(page_dict, cumsum(nrow) %/% total) + 1
+    page_dict$page <- page_dict_page(page_dict)
   }
 
   # Move to next page for footnote and data source
@@ -138,3 +130,9 @@ as_rtf_table <- function(tbl) {
   attr(rtf, "info") <- page_dict
   rtf
 }
+
+# Define page number for each row
+page_dict_page <- function(page_dict) {
+  # Page Number
+  with(page_dict, (cumsum(nrow) - 1) %/% total) + 1
+}

R/rtf_encode_list.R

@@ -151,7 +151,7 @@ rtf_encode_list <- function(tbl) {
 
     info$total <- min(info$total)
 
-    info$page1 <- cumsum(info$nrow) %/% info$total + 1
+    info$page1 <- page_dict_page(info)
 
     page1 <- info[info$page == 1, ]
     page1 <- split(page1, page1$item)

tests/testthat/test-independent-testing-rtf_encode_table.R

@@ -331,9 +331,17 @@ test_that("Test case when using subline_by, page_by, group_by simultaneously wit
 
   attr(ae_t3, "page")$page_title <- "first"
   ae_t3a <- rtf_encode_table(ae_t3)
-  expect_snapshot_output(ae_t3a)
+
+  tmp <- lapply(strsplit(ae_t3a$body, "\\page", fixed = TRUE)[[1]],
+                function(x) grepl("subline", x)
+  )
+  expect_true(tmp[[1]])
 
   attr(ae_t3, "page")$page_title <- "last"
   ae_t3b <- rtf_encode_table(ae_t3)
-  expect_snapshot_output(ae_t3b)
+
+  tmp <- lapply(strsplit(ae_t3b$body, "\\page", fixed = TRUE)[[1]],
+         function(x) grepl("subline", x)
+  )
+  expect_true(tmp[[length(tmp)]])
 })