git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #4921 from pyssling/master

ODT Writer: Improve table header row style handling

commit0272e63527e0b06644e178c51508baf1cf96afa2 authorJohn MacFarlane <jgm@berkeley.edu> dateMon 24 Sep 2018, 10:01 (8 years ago) parent259d6f4ce6e9e8
2 files changed+113−105
compare with master
unifiedsplit
src/Text/Pandoc/Writers/OpenDocument.hs+21−13 test/tables.opendocument+92−92
src/Text/Pandoc/Writers/OpenDocument.hs+21−13
@@ -403,8 +403,8 @@ blockToOpenDocument o bs
403403 else withParagraphStyle o "Table" [Para c]
404404 th <- if all null h
405405 then return empty
406− else colHeadsToOpenDocument o name (map fst paraHStyles) h
407− tr <- mapM (tableRowToOpenDocument o name (map fst paraStyles)) r
406+ else colHeadsToOpenDocument o (map fst paraHStyles) h
407+ tr <- mapM (tableRowToOpenDocument o (map fst paraStyles)) r
408408 return $ inTags True "table:table" [ ("table:name" , name)
409409 , ("table:style-name", name)
410410 ] (vcat columns $$ th $$ vcat tr) $$ captionDoc
@@ -416,24 +416,24 @@ blockToOpenDocument o bs
416416 return $ imageDoc $$ captionDoc
417417
418418colHeadsToOpenDocument :: PandocMonad m
419− => WriterOptions -> String -> [String] -> [[Block]]
419+ => WriterOptions -> [String] -> [[Block]]
420420 -> OD m Doc
421−colHeadsToOpenDocument o tn ns hs =
421+colHeadsToOpenDocument o ns hs =
422422 inTagsIndented "table:table-header-rows" . inTagsIndented "table:table-row" . vcat <$>
423− mapM (tableItemToOpenDocument o tn) (zip ns hs)
423+ mapM (tableItemToOpenDocument o "TableHeaderRowCell") (zip ns hs)
424424
425425tableRowToOpenDocument :: PandocMonad m
426− => WriterOptions -> String -> [String] -> [[Block]]
426+ => WriterOptions -> [String] -> [[Block]]
427427 -> OD m Doc
428−tableRowToOpenDocument o tn ns cs =
428+tableRowToOpenDocument o ns cs =
429429 inTagsIndented "table:table-row" . vcat <$>
430− mapM (tableItemToOpenDocument o tn) (zip ns cs)
430+ mapM (tableItemToOpenDocument o "TableRowCell") (zip ns cs)
431431
432432tableItemToOpenDocument :: PandocMonad m
433433 => WriterOptions -> String -> (String,[Block])
434434 -> OD m Doc
435−tableItemToOpenDocument o tn (n,i) =
436− let a = [ ("table:style-name" , tn ++ ".A1" )
435+tableItemToOpenDocument o s (n,i) =
436+ let a = [ ("table:style-name" , s )
437437 , ("office:value-type", "string" )
438438 ]
439439 in inTags True "table:table-cell" a <$>
@@ -584,13 +584,21 @@ tableStyle num wcs =
584584 , ("style:family", "table-column" )] $
585585 selfClosingTag "style:table-column-properties"
586586 [("style:rel-column-width", printf "%d*" (floor $ w * 65535 :: Integer))]
587− cellStyle = inTags True "style:style"
588− [ ("style:name" , tableId ++ ".A1")
587+ headerRowCellStyle = inTags True "style:style"
588+ [ ("style:name" , "TableHeaderRowCell")
589589 , ("style:family", "table-cell" )] $
590590 selfClosingTag "style:table-cell-properties"
591591 [ ("fo:border", "none")]
592+ rowCellStyle = inTags True "style:style"
593+ [ ("style:name" , "TableRowCell")
594+ , ("style:family", "table-cell" )] $
595+ selfClosingTag "style:table-cell-properties"
596+ [ ("fo:border", "none")]
597+ cellStyles = if num == 0
598+ then headerRowCellStyle $$ rowCellStyle
599+ else empty
592600 columnStyles = map colStyle wcs
593− in table $$ vcat columnStyles $$ cellStyle
601+ in cellStyles $$ table $$ vcat columnStyles
594602
595603paraStyle :: PandocMonad m => [(String,String)] -> OD m Int
596604paraStyle attrs = do
test/tables.opendocument+92−92
@@ -6,59 +6,59 @@
66 <table:table-column table:style-name="Table1.D" />
77 <table:table-header-rows>
88 <table:table-row>
9− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
9+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
1010 <text:p text:style-name="P1">Right</text:p>
1111 </table:table-cell>
12− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
12+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
1313 <text:p text:style-name="Table_20_Heading">Left</text:p>
1414 </table:table-cell>
15− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
15+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
1616 <text:p text:style-name="P2">Center</text:p>
1717 </table:table-cell>
18− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
18+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
1919 <text:p text:style-name="Table_20_Heading">Default</text:p>
2020 </table:table-cell>
2121 </table:table-row>
2222 </table:table-header-rows>
2323 <table:table-row>
24− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
24+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
2525 <text:p text:style-name="P3">12</text:p>
2626 </table:table-cell>
27− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
27+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
2828 <text:p text:style-name="Table_20_Contents">12</text:p>
2929 </table:table-cell>
30− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
30+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
3131 <text:p text:style-name="P4">12</text:p>
3232 </table:table-cell>
33− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
33+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
3434 <text:p text:style-name="Table_20_Contents">12</text:p>
3535 </table:table-cell>
3636 </table:table-row>
3737 <table:table-row>
38− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
38+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
3939 <text:p text:style-name="P3">123</text:p>
4040 </table:table-cell>
41− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
41+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
4242 <text:p text:style-name="Table_20_Contents">123</text:p>
4343 </table:table-cell>
44− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
44+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
4545 <text:p text:style-name="P4">123</text:p>
4646 </table:table-cell>
47− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
47+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
4848 <text:p text:style-name="Table_20_Contents">123</text:p>
4949 </table:table-cell>
5050 </table:table-row>
5151 <table:table-row>
52− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
52+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
5353 <text:p text:style-name="P3">1</text:p>
5454 </table:table-cell>
55− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
55+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
5656 <text:p text:style-name="Table_20_Contents">1</text:p>
5757 </table:table-cell>
58− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
58+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
5959 <text:p text:style-name="P4">1</text:p>
6060 </table:table-cell>
61− <table:table-cell table:style-name="Table1.A1" office:value-type="string">
61+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
6262 <text:p text:style-name="Table_20_Contents">1</text:p>
6363 </table:table-cell>
6464 </table:table-row>
@@ -73,59 +73,59 @@ caption:</text:p>
7373 <table:table-column table:style-name="Table2.D" />
7474 <table:table-header-rows>
7575 <table:table-row>
76− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
76+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
7777 <text:p text:style-name="P5">Right</text:p>
7878 </table:table-cell>
79− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
79+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
8080 <text:p text:style-name="Table_20_Heading">Left</text:p>
8181 </table:table-cell>
82− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
82+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
8383 <text:p text:style-name="P6">Center</text:p>
8484 </table:table-cell>
85− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
85+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
8686 <text:p text:style-name="Table_20_Heading">Default</text:p>
8787 </table:table-cell>
8888 </table:table-row>
8989 </table:table-header-rows>
9090 <table:table-row>
91− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
91+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
9292 <text:p text:style-name="P7">12</text:p>
9393 </table:table-cell>
94− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
94+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
9595 <text:p text:style-name="Table_20_Contents">12</text:p>
9696 </table:table-cell>
97− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
97+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
9898 <text:p text:style-name="P8">12</text:p>
9999 </table:table-cell>
100− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
100+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
101101 <text:p text:style-name="Table_20_Contents">12</text:p>
102102 </table:table-cell>
103103 </table:table-row>
104104 <table:table-row>
105− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
105+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
106106 <text:p text:style-name="P7">123</text:p>
107107 </table:table-cell>
108− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
108+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
109109 <text:p text:style-name="Table_20_Contents">123</text:p>
110110 </table:table-cell>
111− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
111+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
112112 <text:p text:style-name="P8">123</text:p>
113113 </table:table-cell>
114− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
114+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
115115 <text:p text:style-name="Table_20_Contents">123</text:p>
116116 </table:table-cell>
117117 </table:table-row>
118118 <table:table-row>
119− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
119+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
120120 <text:p text:style-name="P7">1</text:p>
121121 </table:table-cell>
122− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
122+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
123123 <text:p text:style-name="Table_20_Contents">1</text:p>
124124 </table:table-cell>
125− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
125+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
126126 <text:p text:style-name="P8">1</text:p>
127127 </table:table-cell>
128− <table:table-cell table:style-name="Table2.A1" office:value-type="string">
128+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
129129 <text:p text:style-name="Table_20_Contents">1</text:p>
130130 </table:table-cell>
131131 </table:table-row>
@@ -139,59 +139,59 @@ spaces:</text:p>
139139 <table:table-column table:style-name="Table3.D" />
140140 <table:table-header-rows>
141141 <table:table-row>
142− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
142+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
143143 <text:p text:style-name="P9">Right</text:p>
144144 </table:table-cell>
145− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
145+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
146146 <text:p text:style-name="Table_20_Heading">Left</text:p>
147147 </table:table-cell>
148− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
148+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
149149 <text:p text:style-name="P10">Center</text:p>
150150 </table:table-cell>
151− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
151+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
152152 <text:p text:style-name="Table_20_Heading">Default</text:p>
153153 </table:table-cell>
154154 </table:table-row>
155155 </table:table-header-rows>
156156 <table:table-row>
157− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
157+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
158158 <text:p text:style-name="P11">12</text:p>
159159 </table:table-cell>
160− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
160+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
161161 <text:p text:style-name="Table_20_Contents">12</text:p>
162162 </table:table-cell>
163− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
163+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
164164 <text:p text:style-name="P12">12</text:p>
165165 </table:table-cell>
166− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
166+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
167167 <text:p text:style-name="Table_20_Contents">12</text:p>
168168 </table:table-cell>
169169 </table:table-row>
170170 <table:table-row>
171− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
171+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
172172 <text:p text:style-name="P11">123</text:p>
173173 </table:table-cell>
174− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
174+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
175175 <text:p text:style-name="Table_20_Contents">123</text:p>
176176 </table:table-cell>
177− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
177+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
178178 <text:p text:style-name="P12">123</text:p>
179179 </table:table-cell>
180− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
180+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
181181 <text:p text:style-name="Table_20_Contents">123</text:p>
182182 </table:table-cell>
183183 </table:table-row>
184184 <table:table-row>
185− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
185+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
186186 <text:p text:style-name="P11">1</text:p>
187187 </table:table-cell>
188− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
188+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
189189 <text:p text:style-name="Table_20_Contents">1</text:p>
190190 </table:table-cell>
191− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
191+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
192192 <text:p text:style-name="P12">1</text:p>
193193 </table:table-cell>
194− <table:table-cell table:style-name="Table3.A1" office:value-type="string">
194+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
195195 <text:p text:style-name="Table_20_Contents">1</text:p>
196196 </table:table-cell>
197197 </table:table-row>
@@ -206,46 +206,46 @@ caption:</text:p>
206206 <table:table-column table:style-name="Table4.D" />
207207 <table:table-header-rows>
208208 <table:table-row>
209− <table:table-cell table:style-name="Table4.A1" office:value-type="string">
209+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
210210 <text:p text:style-name="P13">Centered Header</text:p>
211211 </table:table-cell>
212− <table:table-cell table:style-name="Table4.A1" office:value-type="string">
212+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
213213 <text:p text:style-name="Table_20_Heading">Left Aligned</text:p>
214214 </table:table-cell>
215− <table:table-cell table:style-name="Table4.A1" office:value-type="string">
215+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
216216 <text:p text:style-name="P14">Right Aligned</text:p>
217217 </table:table-cell>
218− <table:table-cell table:style-name="Table4.A1" office:value-type="string">
218+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
219219 <text:p text:style-name="Table_20_Heading">Default aligned</text:p>
220220 </table:table-cell>
221221 </table:table-row>
222222 </table:table-header-rows>
223223 <table:table-row>
224− <table:table-cell table:style-name="Table4.A1" office:value-type="string">
224+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
225225 <text:p text:style-name="P15">First</text:p>
226226 </table:table-cell>
227− <table:table-cell table:style-name="Table4.A1" office:value-type="string">
227+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
228228 <text:p text:style-name="Table_20_Contents">row</text:p>
229229 </table:table-cell>
230− <table:table-cell table:style-name="Table4.A1" office:value-type="string">
230+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
231231 <text:p text:style-name="P16">12.0</text:p>
232232 </table:table-cell>
233− <table:table-cell table:style-name="Table4.A1" office:value-type="string">
233+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
234234 <text:p text:style-name="Table_20_Contents">Example of a row that spans
235235 multiple lines.</text:p>
236236 </table:table-cell>
237237 </table:table-row>
238238 <table:table-row>
239− <table:table-cell table:style-name="Table4.A1" office:value-type="string">
239+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
240240 <text:p text:style-name="P15">Second</text:p>
241241 </table:table-cell>
242− <table:table-cell table:style-name="Table4.A1" office:value-type="string">
242+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
243243 <text:p text:style-name="Table_20_Contents">row</text:p>
244244 </table:table-cell>
245− <table:table-cell table:style-name="Table4.A1" office:value-type="string">
245+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
246246 <text:p text:style-name="P16">5.0</text:p>
247247 </table:table-cell>
248− <table:table-cell table:style-name="Table4.A1" office:value-type="string">
248+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
249249 <text:p text:style-name="Table_20_Contents">Here’s another one. Note the
250250 blank line between rows.</text:p>
251251 </table:table-cell>
@@ -262,46 +262,46 @@ caption:</text:p>
262262 <table:table-column table:style-name="Table5.D" />
263263 <table:table-header-rows>
264264 <table:table-row>
265− <table:table-cell table:style-name="Table5.A1" office:value-type="string">
265+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
266266 <text:p text:style-name="P17">Centered Header</text:p>
267267 </table:table-cell>
268− <table:table-cell table:style-name="Table5.A1" office:value-type="string">
268+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
269269 <text:p text:style-name="Table_20_Heading">Left Aligned</text:p>
270270 </table:table-cell>
271− <table:table-cell table:style-name="Table5.A1" office:value-type="string">
271+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
272272 <text:p text:style-name="P18">Right Aligned</text:p>
273273 </table:table-cell>
274− <table:table-cell table:style-name="Table5.A1" office:value-type="string">
274+ <table:table-cell table:style-name="TableHeaderRowCell" office:value-type="string">
275275 <text:p text:style-name="Table_20_Heading">Default aligned</text:p>
276276 </table:table-cell>
277277 </table:table-row>
278278 </table:table-header-rows>
279279 <table:table-row>
280− <table:table-cell table:style-name="Table5.A1" office:value-type="string">
280+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
281281 <text:p text:style-name="P19">First</text:p>
282282 </table:table-cell>
283− <table:table-cell table:style-name="Table5.A1" office:value-type="string">
283+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
284284 <text:p text:style-name="Table_20_Contents">row</text:p>
285285 </table:table-cell>
286− <table:table-cell table:style-name="Table5.A1" office:value-type="string">
286+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
287287 <text:p text:style-name="P20">12.0</text:p>
288288 </table:table-cell>
289− <table:table-cell table:style-name="Table5.A1" office:value-type="string">
289+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
290290 <text:p text:style-name="Table_20_Contents">Example of a row that spans
291291 multiple lines.</text:p>
292292 </table:table-cell>
293293 </table:table-row>
294294 <table:table-row>
295− <table:table-cell table:style-name="Table5.A1" office:value-type="string">
295+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
296296 <text:p text:style-name="P19">Second</text:p>
297297 </table:table-cell>
298− <table:table-cell table:style-name="Table5.A1" office:value-type="string">
298+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
299299 <text:p text:style-name="Table_20_Contents">row</text:p>
300300 </table:table-cell>
301− <table:table-cell table:style-name="Table5.A1" office:value-type="string">
301+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
302302 <text:p text:style-name="P20">5.0</text:p>
303303 </table:table-cell>
304− <table:table-cell table:style-name="Table5.A1" office:value-type="string">
304+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
305305 <text:p text:style-name="Table_20_Contents">Here’s another one. Note the
306306 blank line between rows.</text:p>
307307 </table:table-cell>
@@ -315,44 +315,44 @@ headers:</text:p>
315315 <table:table-column table:style-name="Table6.C" />
316316 <table:table-column table:style-name="Table6.D" />
317317 <table:table-row>
318− <table:table-cell table:style-name="Table6.A1" office:value-type="string">
318+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
319319 <text:p text:style-name="P24">12</text:p>
320320 </table:table-cell>
321− <table:table-cell table:style-name="Table6.A1" office:value-type="string">
321+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
322322 <text:p text:style-name="Table_20_Contents">12</text:p>
323323 </table:table-cell>
324− <table:table-cell table:style-name="Table6.A1" office:value-type="string">
324+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
325325 <text:p text:style-name="P25">12</text:p>
326326 </table:table-cell>
327− <table:table-cell table:style-name="Table6.A1" office:value-type="string">
327+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
328328 <text:p text:style-name="P26">12</text:p>
329329 </table:table-cell>
330330 </table:table-row>
331331 <table:table-row>
332− <table:table-cell table:style-name="Table6.A1" office:value-type="string">
332+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
333333 <text:p text:style-name="P24">123</text:p>
334334 </table:table-cell>
335− <table:table-cell table:style-name="Table6.A1" office:value-type="string">
335+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
336336 <text:p text:style-name="Table_20_Contents">123</text:p>
337337 </table:table-cell>
338− <table:table-cell table:style-name="Table6.A1" office:value-type="string">
338+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
339339 <text:p text:style-name="P25">123</text:p>
340340 </table:table-cell>
341− <table:table-cell table:style-name="Table6.A1" office:value-type="string">
341+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
342342 <text:p text:style-name="P26">123</text:p>
343343 </table:table-cell>
344344 </table:table-row>
345345 <table:table-row>
346− <table:table-cell table:style-name="Table6.A1" office:value-type="string">
346+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
347347 <text:p text:style-name="P24">1</text:p>
348348 </table:table-cell>
349− <table:table-cell table:style-name="Table6.A1" office:value-type="string">
349+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
350350 <text:p text:style-name="Table_20_Contents">1</text:p>
351351 </table:table-cell>
352− <table:table-cell table:style-name="Table6.A1" office:value-type="string">
352+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
353353 <text:p text:style-name="P25">1</text:p>
354354 </table:table-cell>
355− <table:table-cell table:style-name="Table6.A1" office:value-type="string">
355+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
356356 <text:p text:style-name="P26">1</text:p>
357357 </table:table-cell>
358358 </table:table-row>
@@ -365,31 +365,31 @@ headers:</text:p>
365365 <table:table-column table:style-name="Table7.C" />
366366 <table:table-column table:style-name="Table7.D" />
367367 <table:table-row>
368− <table:table-cell table:style-name="Table7.A1" office:value-type="string">
368+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
369369 <text:p text:style-name="P29">First</text:p>
370370 </table:table-cell>
371− <table:table-cell table:style-name="Table7.A1" office:value-type="string">
371+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
372372 <text:p text:style-name="Table_20_Contents">row</text:p>
373373 </table:table-cell>
374− <table:table-cell table:style-name="Table7.A1" office:value-type="string">
374+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
375375 <text:p text:style-name="P30">12.0</text:p>
376376 </table:table-cell>
377− <table:table-cell table:style-name="Table7.A1" office:value-type="string">
377+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
378378 <text:p text:style-name="Table_20_Contents">Example of a row that spans
379379 multiple lines.</text:p>
380380 </table:table-cell>
381381 </table:table-row>
382382 <table:table-row>
383− <table:table-cell table:style-name="Table7.A1" office:value-type="string">
383+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
384384 <text:p text:style-name="P29">Second</text:p>
385385 </table:table-cell>
386− <table:table-cell table:style-name="Table7.A1" office:value-type="string">
386+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
387387 <text:p text:style-name="Table_20_Contents">row</text:p>
388388 </table:table-cell>
389− <table:table-cell table:style-name="Table7.A1" office:value-type="string">
389+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
390390 <text:p text:style-name="P30">5.0</text:p>
391391 </table:table-cell>
392− <table:table-cell table:style-name="Table7.A1" office:value-type="string">
392+ <table:table-cell table:style-name="TableRowCell" office:value-type="string">
393393 <text:p text:style-name="Table_20_Contents">Here’s another one. Note the
394394 blank line between rows.</text:p>
395395 </table:table-cell>