Skip to content

Commit

Permalink
fixed the old format not working
Browse files Browse the repository at this point in the history
  • Loading branch information
@kpagacz
kpagacz committed May 28, 2024
1 parent 4ebb676 commit 9872a58
Show file tree
Hide file tree
Showing 26 changed files with 1,480 additions and 1,471 deletions.
8 changes: 4 additions & 4 deletions R/add_bottom_borders.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ add_bottom_borders <- function(ht, border_matrix = no_borders(ht), transform_fns
res
}
)
if (border_matrix[row, ncol(border_matrix)]) {
huxtable::right_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)
}
} else {
Expand Down Expand Up @@ -243,10 +244,9 @@ no_borders <- function(ht, matrix = NULL) {
spanning_borders <- function(row) {
function(ht, matrix) {
last_num <- matrix[row][1]
r <- as.matrix(ht[row + 1, ])
browser()
r <- trimws(gsub("\\\\keepn\\\\trhdr", "", ht[row + 1, ]))
for (col in seq_len(length(r))[-1]) {
if (trimws(gsub("\\\\keepn\\\\trhdr", "", as.matrix(ht[row + 1, col]))) != "") {
if (r[col] != "") {
if (r[col - 1] != r[col]) {
last_num <- last_num + 1
}
Expand Down
4 changes: 4 additions & 0 deletions R/gentlg_single.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,10 @@ gentlg_single <- function(huxme = NULL,
bottom_borders <- old_format(ht, colspan, colheader)
}
if (is_table(tlf) || is_listing(tlf)) {
huxtable::left_padding(ht) <- 0
huxtable::right_padding(ht) <- 0
huxtable::bottom_padding(ht) <- 0
huxtable::top_padding(ht) <- 0
ht <- add_bottom_borders(ht, bottom_borders, border_fns)
}
if (is_table(tlf)) {
Expand Down
10 changes: 7 additions & 3 deletions R/quick_rtf_jnj.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ pad_header <- function(result, nheader, header_pad) {
stringr::str_replace_all("\\\\cellx", "\\\\clpadt67\\\\clpadft3\\\\clpadr67\\\\clpadfr3\\\\cellx") %>%
stringr::str_replace("\\\\clpadt67\\\\clpadft3\\\\clpadr67\\\\clpadfr3\\\\cellx", "\\\\clpadr67\\\\clpadfr3\\\\cellx")



ret <- base::paste0(result_sectioned, collapse = "\\row")

return(ret)
Expand Down Expand Up @@ -583,7 +581,13 @@ custom_to_rtf <- function(ht, fc_tables = rtf_fc_tables(ht), watermark,

wrap_def <- ifelse(huxtable::wrap(ht), "", "\\clNoWrap")

pad_def <- NULL
pad_def <- sprintf(
"\\clpadfl3\\clpadl%d \\clpadft3\\clpadt%d \\clpadfb3\\clpadb%d \\clpadfr3\\clpadr%d ",
huxtable::left_padding(ht) * 20,
huxtable::top_padding(ht) * 20,
huxtable::bottom_padding(ht) * 20,
huxtable::right_padding(ht) * 20
)

table_width <- huxtable::width(ht)
col_width <- huxtable::col_width(ht)
Expand Down
5 changes: 3 additions & 2 deletions man/spanning_borders.Rd
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

108 changes: 54 additions & 54 deletions tests/testthat/_snaps/borders/noborders.rtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

{
\trowd
\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
\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
\pard\intbl\ql\fs20 \b \b0 \cell
\pard\intbl\ql\fs20 \b \b0 \cell
\pard\intbl\ql\fs20 \b \b0 \cell
Expand All @@ -19,12 +19,12 @@

{
\trowd
\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
\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
\pard\intbl\qc\fs18 \keepn\trhdr Measures \cell
\pard\intbl\qc\fs18 \keepn\trhdr Measures \cell
\pard\intbl\qc\fs18 \keepn\trhdr Measures \cell
Expand All @@ -35,12 +35,12 @@

{
\trowd
\trqc \clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadr67\clpadfr3\cellx4135
\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadt67\clpadft3\clpadr67\clpadfr3\cellx5146
\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadt67\clpadft3\clpadr67\clpadfr3\cellx6157
\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadt67\clpadft3\clpadr67\clpadfr3\cellx7168
\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadt67\clpadft3\clpadr67\clpadfr3\cellx8179
\clbrdrt\clbrdrl\clbrdrb\clbrdrr\clvertalb\clpadt67\clpadft3\clpadr67\clpadfr3\cellx9189 \pard\intbl\ql\fs18 \keepn\trhdr \cell
\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
\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
Expand All @@ -51,12 +51,12 @@

{
\trowd
\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
\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
\pard\intbl\qc\fs18 5.1 \cell
\pard\intbl\qc\fs18 3.5 \cell
\pard\intbl\qc\fs18 1.4 \cell
Expand All @@ -67,12 +67,12 @@

{
\trowd
\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
\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
\pard\intbl\qc\fs18 4.9 \cell
\pard\intbl\qc\fs18 3 \cell
\pard\intbl\qc\fs18 1.4 \cell
Expand All @@ -83,12 +83,12 @@

{
\trowd
\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
\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
\pard\intbl\qc\fs18 4.7 \cell
\pard\intbl\qc\fs18 3.2 \cell
\pard\intbl\qc\fs18 1.3 \cell
Expand All @@ -99,12 +99,12 @@

{
\trowd
\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
\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
\pard\intbl\qc\fs18 4.6 \cell
\pard\intbl\qc\fs18 3.1 \cell
\pard\intbl\qc\fs18 1.5 \cell
Expand All @@ -115,12 +115,12 @@

{
\trowd
\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
\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
\pard\intbl\qc\fs18 5 \cell
\pard\intbl\qc\fs18 3.6 \cell
\pard\intbl\qc\fs18 1.4 \cell
Expand All @@ -131,12 +131,12 @@

{
\trowd
\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
\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
\pard\intbl\qc\line Footer1\cell
\pard\intbl\qc\line Footer1\cell
\pard\intbl\qc\line Footer1\cell
Expand Down
Loading

0 comments on commit 9872a58

Please sign in to comment.