Skip to content

Commit 0abdbec

Browse files
rich-iannonerich-iannone
authored
Merge pull request #1121 from rstudio/rtf-spanner-fix
Fix display of spanner column labels in different applications that render RTF
2 parents 01c26a0 + 25ee1ec commit 0abdbec

File tree

5 files changed

+107
-91
lines changed

5 files changed

+107
-91
lines changed

‎.Rbuildignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
vignettes
1616
man/figures/
1717
tests/gt-examples
18+
tests/performance-monitoring
1819
tests/testthat/_snaps
1920
tests/testthat/test-as_raw_html.R
2021
tests/testthat/test-as_word.R

‎DESCRIPTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ BugReports: https://github.com/rstudio/gt/issues
2727
Encoding: UTF-8
2828
LazyData: true
2929
ByteCompile: true
30-
RoxygenNote: 7.2.1
30+
RoxygenNote: 7.2.2
3131
Depends:
3232
R (>= 3.2.0)
3333
Imports:

‎R/utils_render_rtf.R‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1234,10 +1234,11 @@ create_columns_component_rtf <- function(data) {
12341234
spanner_ids_row[is.na(spanner_ids_row)] <- ""
12351235
spanners_row[is.na(spanners_row)] <- ""
12361236

1237-
spanners_lengths <- unclass(rle(spanner_ids[i, ]))
1237+
spanners_rle <- rle(unname(spanner_ids[i, ]))
12381238

1239-
merge_keys_spanners <- c()
1239+
spanners_lengths <- unclass(spanners_rle)
12401240

1241+
merge_keys_spanners <- c()
12411242
for (j in seq_along(spanners_lengths$lengths)) {
12421243
if (spanners_lengths$lengths[j] == 1) {
12431244
merge_keys_spanners <- c(merge_keys_spanners, 0)
@@ -1246,6 +1247,20 @@ create_columns_component_rtf <- function(data) {
12461247
}
12471248
}
12481249

1250+
# The `sig_cells` vector contains the indices of spanners' elements
1251+
# where the value is either NA, or, is different than the previous value;
1252+
# because NAs are distinct, every NA element will be present in `sig_cells`
1253+
sig_cells <- c(1, utils::head(cumsum(spanners_rle$lengths) + 1, -1))
1254+
1255+
# Replace repeating labels with an empty string, based on the
1256+
# vector `sig_cells`
1257+
for (k in seq_along(spanner_ids_row)) {
1258+
if (k %in% sig_cells) next
1259+
if (!(k %in% sig_cells)) {
1260+
spanners_row[k] <- ""
1261+
}
1262+
}
1263+
12491264
level_i_spanners <-
12501265
lapply(
12511266
seq_along(spanner_ids_row),

‎tests/testthat/_snaps/group_column_label.md‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx4160
4646
\intbl {\f0 {\f0\fs20 timing}}\cell
4747

48-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx5200
49-
\intbl {\f0 {\f0\fs20 timing}}\cell
48+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx5200
49+
\intbl {\f0 {\f0\fs20 }}\cell
5050

51-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx6240
52-
\intbl {\f0 {\f0\fs20 timing}}\cell
51+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx6240
52+
\intbl {\f0 {\f0\fs20 }}\cell
5353

5454
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx7280
5555
\intbl {\f0 {\f0\fs20 }}\cell
@@ -397,11 +397,11 @@
397397
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx4160
398398
\intbl {\f0 {\f0\fs20 timing}}\cell
399399

400-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx5200
401-
\intbl {\f0 {\f0\fs20 timing}}\cell
400+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx5200
401+
\intbl {\f0 {\f0\fs20 }}\cell
402402

403-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx6240
404-
\intbl {\f0 {\f0\fs20 timing}}\cell
403+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx6240
404+
\intbl {\f0 {\f0\fs20 }}\cell
405405

406406
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx7280
407407
\intbl {\f0 {\f0\fs20 }}\cell
@@ -749,11 +749,11 @@
749749
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx4680
750750
\intbl {\f0 {\f0\fs20 timing}}\cell
751751

752-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx5850
753-
\intbl {\f0 {\f0\fs20 timing}}\cell
752+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx5850
753+
\intbl {\f0 {\f0\fs20 }}\cell
754754

755-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx7020
756-
\intbl {\f0 {\f0\fs20 timing}}\cell
755+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx7020
756+
\intbl {\f0 {\f0\fs20 }}\cell
757757

758758
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx8190
759759
\intbl {\f0 {\f0\fs20 }}\cell
@@ -1088,11 +1088,11 @@
10881088
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx5200
10891089
\intbl {\f0 {\f0\fs20 timing}}\cell
10901090

1091-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx6240
1092-
\intbl {\f0 {\f0\fs20 timing}}\cell
1091+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx6240
1092+
\intbl {\f0 {\f0\fs20 }}\cell
10931093

1094-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx7280
1095-
\intbl {\f0 {\f0\fs20 timing}}\cell
1094+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx7280
1095+
\intbl {\f0 {\f0\fs20 }}\cell
10961096

10971097
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx8320
10981098
\intbl {\f0 {\f0\fs20 }}\cell
@@ -1440,11 +1440,11 @@
14401440
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx5200
14411441
\intbl {\f0 {\f0\fs20 timing}}\cell
14421442

1443-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx6240
1444-
\intbl {\f0 {\f0\fs20 timing}}\cell
1443+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx6240
1444+
\intbl {\f0 {\f0\fs20 }}\cell
14451445

1446-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx7280
1447-
\intbl {\f0 {\f0\fs20 timing}}\cell
1446+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx7280
1447+
\intbl {\f0 {\f0\fs20 }}\cell
14481448

14491449
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx8320
14501450
\intbl {\f0 {\f0\fs20 }}\cell
@@ -1792,11 +1792,11 @@
17921792
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx5200
17931793
\intbl {\f0 {\f0\fs20 timing}}\cell
17941794

1795-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx6240
1796-
\intbl {\f0 {\f0\fs20 timing}}\cell
1795+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx6240
1796+
\intbl {\f0 {\f0\fs20 }}\cell
17971797

1798-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx7280
1799-
\intbl {\f0 {\f0\fs20 timing}}\cell
1798+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx7280
1799+
\intbl {\f0 {\f0\fs20 }}\cell
18001800

18011801
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx8320
18021802
\intbl {\f0 {\f0\fs20 }}\cell
@@ -2144,11 +2144,11 @@
21442144
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx5850
21452145
\intbl {\f0 {\f0\fs20 timing}}\cell
21462146

2147-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx7020
2148-
\intbl {\f0 {\f0\fs20 timing}}\cell
2147+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx7020
2148+
\intbl {\f0 {\f0\fs20 }}\cell
21492149

2150-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx8190
2151-
\intbl {\f0 {\f0\fs20 timing}}\cell
2150+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx8190
2151+
\intbl {\f0 {\f0\fs20 }}\cell
21522152

21532153
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx9360
21542154
\intbl {\f0 {\f0\fs20 }}\cell
@@ -2483,11 +2483,11 @@
24832483
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx6240
24842484
\intbl {\f0 {\f0\fs20 timing}}\cell
24852485

2486-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx7280
2487-
\intbl {\f0 {\f0\fs20 timing}}\cell
2486+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx7280
2487+
\intbl {\f0 {\f0\fs20 }}\cell
24882488

2489-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx8320
2490-
\intbl {\f0 {\f0\fs20 timing}}\cell
2489+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx8320
2490+
\intbl {\f0 {\f0\fs20 }}\cell
24912491

24922492
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx9360
24932493
\intbl {\f0 {\f0\fs20 }}\cell
@@ -2832,11 +2832,11 @@
28322832
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx4680
28332833
\intbl {\f0 {\f0\fs20 timing}}\cell
28342834

2835-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx5616
2836-
\intbl {\f0 {\f0\fs20 timing}}\cell
2835+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx5616
2836+
\intbl {\f0 {\f0\fs20 }}\cell
28372837

2838-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx6552
2839-
\intbl {\f0 {\f0\fs20 timing}}\cell
2838+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx6552
2839+
\intbl {\f0 {\f0\fs20 }}\cell
28402840

28412841
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx7488
28422842
\intbl {\f0 {\f0\fs20 }}\cell
@@ -3316,11 +3316,11 @@
33163316
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx4680
33173317
\intbl {\f0 {\f0\fs20 timing}}\cell
33183318

3319-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx5616
3320-
\intbl {\f0 {\f0\fs20 timing}}\cell
3319+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx5616
3320+
\intbl {\f0 {\f0\fs20 }}\cell
33213321

3322-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx6552
3323-
\intbl {\f0 {\f0\fs20 timing}}\cell
3322+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx6552
3323+
\intbl {\f0 {\f0\fs20 }}\cell
33243324

33253325
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx7488
33263326
\intbl {\f0 {\f0\fs20 }}\cell
@@ -3800,11 +3800,11 @@
38003800
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx5200
38013801
\intbl {\f0 {\f0\fs20 timing}}\cell
38023802

3803-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx6240
3804-
\intbl {\f0 {\f0\fs20 timing}}\cell
3803+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx6240
3804+
\intbl {\f0 {\f0\fs20 }}\cell
38053805

3806-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx7280
3807-
\intbl {\f0 {\f0\fs20 timing}}\cell
3806+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx7280
3807+
\intbl {\f0 {\f0\fs20 }}\cell
38083808

38093809
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx8320
38103810
\intbl {\f0 {\f0\fs20 }}\cell
@@ -4445,11 +4445,11 @@
44454445
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx5200
44464446
\intbl {\f0 {\f0\fs20 timing}}\cell
44474447

4448-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx6240
4449-
\intbl {\f0 {\f0\fs20 timing}}\cell
4448+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx6240
4449+
\intbl {\f0 {\f0\fs20 }}\cell
44504450

4451-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx7280
4452-
\intbl {\f0 {\f0\fs20 timing}}\cell
4451+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx7280
4452+
\intbl {\f0 {\f0\fs20 }}\cell
44534453

44544454
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx8320
44554455
\intbl {\f0 {\f0\fs20 }}\cell
@@ -5076,11 +5076,11 @@
50765076
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx5200
50775077
\intbl {\f0 {\f0\fs20 timing}}\cell
50785078

5079-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx6240
5080-
\intbl {\f0 {\f0\fs20 timing}}\cell
5079+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx6240
5080+
\intbl {\f0 {\f0\fs20 }}\cell
50815081

5082-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx7280
5083-
\intbl {\f0 {\f0\fs20 timing}}\cell
5082+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx7280
5083+
\intbl {\f0 {\f0\fs20 }}\cell
50845084

50855085
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx8320
50865086
\intbl {\f0 {\f0\fs20 }}\cell
@@ -5521,11 +5521,11 @@
55215521
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx5200
55225522
\intbl {\f0 {\f0\fs20 timing}}\cell
55235523

5524-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx6240
5525-
\intbl {\f0 {\f0\fs20 timing}}\cell
5524+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx6240
5525+
\intbl {\f0 {\f0\fs20 }}\cell
55265526

5527-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx7280
5528-
\intbl {\f0 {\f0\fs20 timing}}\cell
5527+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx7280
5528+
\intbl {\f0 {\f0\fs20 }}\cell
55295529

55305530
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx8320
55315531
\intbl {\f0 {\f0\fs20 }}\cell
@@ -5966,11 +5966,11 @@
59665966
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx5850
59675967
\intbl {\f0 {\f0\fs20 timing}}\cell
59685968

5969-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx7020
5970-
\intbl {\f0 {\f0\fs20 timing}}\cell
5969+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx7020
5970+
\intbl {\f0 {\f0\fs20 }}\cell
59715971

5972-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx8190
5973-
\intbl {\f0 {\f0\fs20 timing}}\cell
5972+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx8190
5973+
\intbl {\f0 {\f0\fs20 }}\cell
59745974

59755975
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx9360
59765976
\intbl {\f0 {\f0\fs20 }}\cell
@@ -6557,11 +6557,11 @@
65576557
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmgf \cellx6240
65586558
\intbl {\f0 {\f0\fs20 timing}}\cell
65596559

6560-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx7280
6561-
\intbl {\f0 {\f0\fs20 timing}}\cell
6560+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx7280
6561+
\intbl {\f0 {\f0\fs20 }}\cell
65626562

6563-
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clbrdrb\brdrs\brdrw20\brdrcf2\clmrg \cellx8320
6564-
\intbl {\f0 {\f0\fs20 timing}}\cell
6563+
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85\clmrg \cellx8320
6564+
\intbl {\f0 {\f0\fs20 }}\cell
65656565

65666566
\pard\plain\uc0\qc\clvertalc \clpadfl3\clpadl25 \clpadft3\clpadt85 \clpadfb3\clpadb25 \clpadfr3\clpadr85 \cellx9360
65676567
\intbl {\f0 {\f0\fs20 }}\cell

0 commit comments

Comments
 (0)