actually remove the zero padding (and not just have a function that d…

…oes it); fix unaligned padding in the first column
pharmaverse · May 31, 2024 · 9d2f8cd · 9d2f8cd
1 parent 248a020
commit 9d2f8cd
Show file tree

Hide file tree

Showing 37 changed files with 1,905 additions and 1,904 deletions.
diff --git a/R/add_bottom_borders.R b/R/add_bottom_borders.R
@@ -196,12 +196,10 @@ add_bottom_borders <- function(ht, border_matrix = no_borders(ht), transform_fns
           res
         }
       )
-      huxtable::right_padding(ht)[border_matrix[row, ] != 0] <- 3
+      huxtable::right_padding(ht)[row, border_matrix[row, ] != 0] <- 3
       # This is in fact interpreted as left padding by Word...
-      huxtable::top_padding(ht)[border_matrix[row, ] != 0] <- 3
-      if (border_matrix[row, ncol(border_matrix)] != 0) {
-        ht <- huxtable::set_right_padding(ht, row, ncol(border_matrix), 0)
-      }
+      huxtable::top_padding(ht)[row, border_matrix[row, ] != 0] <- 3
+      huxtable::top_padding(ht)[row, 1] <- 0
     } else {
       huxtable::bottom_border(ht)[row, border_matrix[row, ] != 0] <- huxtable::brdr(thickness = 0.9, style = "solid")
     }

diff --git a/R/quick_rtf_jnj.R b/R/quick_rtf_jnj.R
@@ -882,6 +882,8 @@ quick_rtf_jnj <- function(hts,
     tables
   )
 
+  file_contents <- remove_zero_padding(file_contents)
+
   sink(file)
   cat(file_contents)
   sink()

diff --git a/R/remove_zero_padding.R b/R/remove_zero_padding.R
@@ -10,7 +10,7 @@
 #' @keywords internal
 remove_zero_padding <- function(rtf) {
   noop_padding <- function(direction) {
-    sprintf(r"{\\clpadf%s3\\clpad%s0}", direction, direction)
+    sprintf(r"{\\clpadf%s3\\clpad%s0 }", direction, direction)
   }
   for (direction in c("l", "r", "b", "t")) {
     rtf <- stringr::str_replace_all(rtf, noop_padding(direction), "")

diff --git a/tests/testthat/_snaps/borders/noborders.rtf b/tests/testthat/_snaps/borders/noborders.rtf
@@ -3,12 +3,12 @@
 
 {
 \trowd
-\trqc \clmgf\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\brdrs\brdrw18\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx4135 
-\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\brdrs\brdrw18\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx5146 
-\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\brdrs\brdrw18\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx6157 
-\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\brdrs\brdrw18\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx7168 
-\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\brdrs\brdrw18\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx8179 
-\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\brdrs\brdrw18\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx9189 \pard\intbl\ql\fs20 \b \pnhang\trhdr\fi-1152\li1152\keepn\s15 noborders:\tab Title1\b0 \cell
+\trqc \clmgf\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\brdrs\brdrw18\clbrdrr\clvertalb\cellx4135 
+\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\brdrs\brdrw18\clbrdrr\clvertalb\cellx5146 
+\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\brdrs\brdrw18\clbrdrr\clvertalb\cellx6157 
+\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\brdrs\brdrw18\clbrdrr\clvertalb\cellx7168 
+\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\brdrs\brdrw18\clbrdrr\clvertalb\cellx8179 
+\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\brdrs\brdrw18\clbrdrr\clvertalb\cellx9189 \pard\intbl\ql\fs20 \b \pnhang\trhdr\fi-1152\li1152\keepn\s15 noborders:\tab Title1\b0 \cell
 \pard\intbl\ql\fs20 \b \b0 \cell
 \pard\intbl\ql\fs20 \b \b0 \cell
 \pard\intbl\ql\fs20 \b \b0 \cell
@@ -19,12 +19,12 @@
 
 {
 \trowd
-\trqc \clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \clpadr67\clpadfr3\cellx4135 
-\clmgf\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \clpadt67\clpadft3\clpadr67\clpadfr3\cellx5146 
-\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \clpadt67\clpadft3\clpadr67\clpadfr3\cellx6157 
-\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \clpadt67\clpadft3\clpadr67\clpadfr3\cellx7168 
-\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \clpadt67\clpadft3\clpadr67\clpadfr3\cellx8179 
-\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \clpadt67\clpadft3\clpadr67\clpadfr3\cellx9189 \pard\intbl\ql\fs18 \keepn\trhdr  \cell
+\trqc \clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadr67\clpadfr3\cellx4135 
+\clmgf\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadt67\clpadft3\clpadr67\clpadfr3\cellx5146 
+\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadt67\clpadft3\clpadr67\clpadfr3\cellx6157 
+\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadt67\clpadft3\clpadr67\clpadfr3\cellx7168 
+\clmrg\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadt67\clpadft3\clpadr67\clpadfr3\cellx8179 
+\clbrdrt\brdrs\brdrw18\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadt67\clpadft3\clpadr67\clpadfr3\cellx9189 \pard\intbl\ql\fs18 \keepn\trhdr  \cell
 \pard\intbl\qc\fs18 \keepn\trhdr Measures \cell
 \pard\intbl\qc\fs18 \keepn\trhdr Measures \cell
 \pard\intbl\qc\fs18 \keepn\trhdr Measures \cell
@@ -35,12 +35,12 @@
 
 {
 \trowd
-\trqc \clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx4135 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx5146 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx6157 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx7168 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx8179 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx9189 \pard\intbl\ql\fs18 \keepn\trhdr  \cell
+\trqc \clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx4135 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx5146 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx6157 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx7168 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx8179 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx9189 \pard\intbl\ql\fs18 \keepn\trhdr  \cell
 \pard\intbl\qc\fs18 \keepn\trhdr Sepal.Width \cell
 \pard\intbl\qc\fs18 \keepn\trhdr Petal.Length \cell
 \pard\intbl\qc\fs18 \keepn\trhdr Petal.Width \cell
@@ -51,12 +51,12 @@
 
 {
 \trowd
-\trqc \clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx4135 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx5146 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx6157 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx7168 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx8179 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx9189 \pard\intbl\ql\fs18 Label \cell
+\trqc \clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx4135 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx5146 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx6157 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx7168 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx8179 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx9189 \pard\intbl\ql\fs18 Label \cell
 \pard\intbl\qc\fs18 5.1 \cell
 \pard\intbl\qc\fs18 3.5 \cell
 \pard\intbl\qc\fs18 1.4 \cell
@@ -67,12 +67,12 @@
 
 {
 \trowd
-\trqc \clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx4135 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx5146 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx6157 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx7168 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx8179 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx9189 \pard\intbl\ql\fs18  \cell
+\trqc \clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx4135 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx5146 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx6157 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx7168 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx8179 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx9189 \pard\intbl\ql\fs18  \cell
 \pard\intbl\qc\fs18 4.9 \cell
 \pard\intbl\qc\fs18 3 \cell
 \pard\intbl\qc\fs18 1.4 \cell
@@ -83,12 +83,12 @@
 
 {
 \trowd
-\trqc \clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx4135 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx5146 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx6157 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx7168 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx8179 
-\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx9189 \pard\intbl\ql\fs18  \cell
+\trqc \clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx4135 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx5146 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx6157 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx7168 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx8179 
+\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx9189 \pard\intbl\ql\fs18  \cell
 \pard\intbl\qc\fs18 4.7 \cell
 \pard\intbl\qc\fs18 3.2 \cell
 \pard\intbl\qc\fs18 1.3 \cell
@@ -99,12 +99,12 @@
 
 {
 \trowd
-\trqc \clbrdrt\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx4135 
-\clbrdrt\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx5146 
-\clbrdrt\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx6157 
-\clbrdrt\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx7168 
-\clbrdrt\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx8179 
-\clbrdrt\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx9189 \pard\intbl\ql\fs18  \cell
+\trqc \clbrdrt\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\cellx4135 
+\clbrdrt\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\cellx5146 
+\clbrdrt\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\cellx6157 
+\clbrdrt\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\cellx7168 
+\clbrdrt\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\cellx8179 
+\clbrdrt\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\cellx9189 \pard\intbl\ql\fs18  \cell
 \pard\intbl\qc\fs18 4.6 \cell
 \pard\intbl\qc\fs18 3.1 \cell
 \pard\intbl\qc\fs18 1.5 \cell
@@ -115,12 +115,12 @@
 
 {
 \trowd
-\trqc \clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx4135 
-\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx5146 
-\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx6157 
-\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx7168 
-\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx8179 
-\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx9189 \pard\intbl\ql\fs18  \cell
+\trqc \clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\cellx4135 
+\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\cellx5146 
+\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\cellx6157 
+\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\cellx7168 
+\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\cellx8179 
+\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\brdrs\brdrw18\brdrcf1\clbrdrr\clvertalb\cellx9189 \pard\intbl\ql\fs18  \cell
 \pard\intbl\qc\fs18 5 \cell
 \pard\intbl\qc\fs18 3.6 \cell
 \pard\intbl\qc\fs18 1.4 \cell
@@ -131,12 +131,12 @@
 
 {
 \trowd
-\trqc \clmgf\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx4135 
-\clmrg\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx5146 
-\clmrg\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx6157 
-\clmrg\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx7168 
-\clmrg\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx8179 
-\clmrg\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadfl3\clpadl0 \clpadft3\clpadt0 \clpadfb3\clpadb0 \clpadfr3\clpadr0 \cellx9189 \pard\intbl\ql\fs18 \line Footer1 \cell
+\trqc \clmgf\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx4135 
+\clmrg\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx5146 
+\clmrg\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx6157 
+\clmrg\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx7168 
+\clmrg\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx8179 
+\clmrg\clbrdrt\brdrs\brdrw18\brdrcf1\clbrdrl\clbrdrb\clbrdrr\clvertalb\cellx9189 \pard\intbl\ql\fs18 \line Footer1 \cell
 \pard\intbl\qc\line Footer1\cell
 \pard\intbl\qc\line Footer1\cell
 \pard\intbl\qc\line Footer1\cell