git.iko.soy/typeable/pandoc
on master help sign in
Merge pull request #4921 from pyssling/master
0272e63John MacFarlane
src/Text/Pandoc/Writers/OpenDocument.hs+21−13
compare with master
unifiedsplit
@@ -403,8 +403,8 @@ blockToOpenDocument o bs
403 else withParagraphStyle o "Table" [Para c]
403 else withParagraphStyle o "Table" [Para c]
404 th <- if all null h
404 th <- if all null h
405 then return empty
405 then return empty
406− else colHeadsToOpenDocument o name (map fst paraHStyles) h
406+ else colHeadsToOpenDocument o (map fst paraHStyles) h
407− tr <- mapM (tableRowToOpenDocument o name (map fst paraStyles)) r
407+ tr <- mapM (tableRowToOpenDocument o (map fst paraStyles)) r
408 return $ inTags True "table:table" [ ("table:name" , name)
408 return $ inTags True "table:table" [ ("table:name" , name)
409 , ("table:style-name", name)
409 , ("table:style-name", name)
410 ] (vcat columns $$ th $$ vcat tr) $$ captionDoc
410 ] (vcat columns $$ th $$ vcat tr) $$ captionDoc
@@ -416,24 +416,24 @@ blockToOpenDocument o bs
416 return $ imageDoc $$ captionDoc
416 return $ imageDoc $$ captionDoc
417
417
418colHeadsToOpenDocument :: PandocMonad m
418colHeadsToOpenDocument :: PandocMonad m
419− => WriterOptions -> String -> [String] -> [[Block]]
419+ => WriterOptions -> [String] -> [[Block]]
420 -> OD m Doc
420 -> OD m Doc
421−colHeadsToOpenDocument o tn ns hs =
421+colHeadsToOpenDocument o ns hs =
422 inTagsIndented "table:table-header-rows" . inTagsIndented "table:table-row" . vcat <$>
422 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)
424
424
425tableRowToOpenDocument :: PandocMonad m
425tableRowToOpenDocument :: PandocMonad m
426− => WriterOptions -> String -> [String] -> [[Block]]
426+ => WriterOptions -> [String] -> [[Block]]
427 -> OD m Doc
427 -> OD m Doc
428−tableRowToOpenDocument o tn ns cs =
428+tableRowToOpenDocument o ns cs =
429 inTagsIndented "table:table-row" . vcat <$>
429 inTagsIndented "table:table-row" . vcat <$>
430− mapM (tableItemToOpenDocument o tn) (zip ns cs)
430+ mapM (tableItemToOpenDocument o "TableRowCell") (zip ns cs)
431
431
432tableItemToOpenDocument :: PandocMonad m
432tableItemToOpenDocument :: PandocMonad m
433 => WriterOptions -> String -> (String,[Block])
433 => WriterOptions -> String -> (String,[Block])
434 -> OD m Doc
434 -> OD m Doc
435−tableItemToOpenDocument o tn (n,i) =
435+tableItemToOpenDocument o s (n,i) =
436− let a = [ ("table:style-name" , tn ++ ".A1" )
436+ let a = [ ("table:style-name" , s )
437 , ("office:value-type", "string" )
437 , ("office:value-type", "string" )
438 ]
438 ]
439 in inTags True "table:table-cell" a <$>
439 in inTags True "table:table-cell" a <$>
@@ -584,13 +584,21 @@ tableStyle num wcs =
584 , ("style:family", "table-column" )] $
584 , ("style:family", "table-column" )] $
585 selfClosingTag "style:table-column-properties"
585 selfClosingTag "style:table-column-properties"
586 [("style:rel-column-width", printf "%d*" (floor $ w * 65535 :: Integer))]
586 [("style:rel-column-width", printf "%d*" (floor $ w * 65535 :: Integer))]
587− cellStyle = inTags True "style:style"
587+ headerRowCellStyle = inTags True "style:style"
588− [ ("style:name" , tableId ++ ".A1")
588+ [ ("style:name" , "TableHeaderRowCell")
589 , ("style:family", "table-cell" )] $
589 , ("style:family", "table-cell" )] $
590 selfClosingTag "style:table-cell-properties"
590 selfClosingTag "style:table-cell-properties"
591 [ ("fo:border", "none")]
591 [ ("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
592 columnStyles = map colStyle wcs
600 columnStyles = map colStyle wcs
593− in table $$ vcat columnStyles $$ cellStyle
601+ in cellStyles $$ table $$ vcat columnStyles
594
602
595paraStyle :: PandocMonad m => [(String,String)] -> OD m Int
603paraStyle :: PandocMonad m => [(String,String)] -> OD m Int
596paraStyle attrs = do
604paraStyle attrs = do
test/tables.opendocument+92−92
@@ -6,59 +6,59 @@
6 <table:table-column table:style-name="Table1.D" />
6 <table:table-column table:style-name="Table1.D" />
7 <table:table-header-rows>
7 <table:table-header-rows>
8 <table:table-row>
8 <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">
10 <text:p text:style-name="P1">Right</text:p>
10 <text:p text:style-name="P1">Right</text:p>
11 </table:table-cell>
11 </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">
13 <text:p text:style-name="Table_20_Heading">Left</text:p>
13 <text:p text:style-name="Table_20_Heading">Left</text:p>
14 </table:table-cell>
14 </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">
16 <text:p text:style-name="P2">Center</text:p>
16 <text:p text:style-name="P2">Center</text:p>
17 </table:table-cell>
17 </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">
19 <text:p text:style-name="Table_20_Heading">Default</text:p>
19 <text:p text:style-name="Table_20_Heading">Default</text:p>
20 </table:table-cell>
20 </table:table-cell>
21 </table:table-row>
21 </table:table-row>
22 </table:table-header-rows>
22 </table:table-header-rows>
23 <table:table-row>
23 <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">
25 <text:p text:style-name="P3">12</text:p>
25 <text:p text:style-name="P3">12</text:p>
26 </table:table-cell>
26 </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">
28 <text:p text:style-name="Table_20_Contents">12</text:p>
28 <text:p text:style-name="Table_20_Contents">12</text:p>
29 </table:table-cell>
29 </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">
31 <text:p text:style-name="P4">12</text:p>
31 <text:p text:style-name="P4">12</text:p>
32 </table:table-cell>
32 </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">
34 <text:p text:style-name="Table_20_Contents">12</text:p>
34 <text:p text:style-name="Table_20_Contents">12</text:p>
35 </table:table-cell>
35 </table:table-cell>
36 </table:table-row>
36 </table:table-row>
37 <table:table-row>
37 <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">
39 <text:p text:style-name="P3">123</text:p>
39 <text:p text:style-name="P3">123</text:p>
40 </table:table-cell>
40 </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">
42 <text:p text:style-name="Table_20_Contents">123</text:p>
42 <text:p text:style-name="Table_20_Contents">123</text:p>
43 </table:table-cell>
43 </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">
45 <text:p text:style-name="P4">123</text:p>
45 <text:p text:style-name="P4">123</text:p>
46 </table:table-cell>
46 </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">
48 <text:p text:style-name="Table_20_Contents">123</text:p>
48 <text:p text:style-name="Table_20_Contents">123</text:p>
49 </table:table-cell>
49 </table:table-cell>
50 </table:table-row>
50 </table:table-row>
51 <table:table-row>
51 <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">
53 <text:p text:style-name="P3">1</text:p>
53 <text:p text:style-name="P3">1</text:p>
54 </table:table-cell>
54 </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">
56 <text:p text:style-name="Table_20_Contents">1</text:p>
56 <text:p text:style-name="Table_20_Contents">1</text:p>
57 </table:table-cell>
57 </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">
59 <text:p text:style-name="P4">1</text:p>
59 <text:p text:style-name="P4">1</text:p>
60 </table:table-cell>
60 </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">
62 <text:p text:style-name="Table_20_Contents">1</text:p>
62 <text:p text:style-name="Table_20_Contents">1</text:p>
63 </table:table-cell>
63 </table:table-cell>
64 </table:table-row>
64 </table:table-row>
@@ -73,59 +73,59 @@ caption:</text:p>
73 <table:table-column table:style-name="Table2.D" />
73 <table:table-column table:style-name="Table2.D" />
74 <table:table-header-rows>
74 <table:table-header-rows>
75 <table:table-row>
75 <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">
77 <text:p text:style-name="P5">Right</text:p>
77 <text:p text:style-name="P5">Right</text:p>
78 </table:table-cell>
78 </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">
80 <text:p text:style-name="Table_20_Heading">Left</text:p>
80 <text:p text:style-name="Table_20_Heading">Left</text:p>
81 </table:table-cell>
81 </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">
83 <text:p text:style-name="P6">Center</text:p>
83 <text:p text:style-name="P6">Center</text:p>
84 </table:table-cell>
84 </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">
86 <text:p text:style-name="Table_20_Heading">Default</text:p>
86 <text:p text:style-name="Table_20_Heading">Default</text:p>
87 </table:table-cell>
87 </table:table-cell>
88 </table:table-row>
88 </table:table-row>
89 </table:table-header-rows>
89 </table:table-header-rows>
90 <table:table-row>
90 <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">
92 <text:p text:style-name="P7">12</text:p>
92 <text:p text:style-name="P7">12</text:p>
93 </table:table-cell>
93 </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">
95 <text:p text:style-name="Table_20_Contents">12</text:p>
95 <text:p text:style-name="Table_20_Contents">12</text:p>
96 </table:table-cell>
96 </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">
98 <text:p text:style-name="P8">12</text:p>
98 <text:p text:style-name="P8">12</text:p>
99 </table:table-cell>
99 </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">
101 <text:p text:style-name="Table_20_Contents">12</text:p>
101 <text:p text:style-name="Table_20_Contents">12</text:p>
102 </table:table-cell>
102 </table:table-cell>
103 </table:table-row>
103 </table:table-row>
104 <table:table-row>
104 <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">
106 <text:p text:style-name="P7">123</text:p>
106 <text:p text:style-name="P7">123</text:p>
107 </table:table-cell>
107 </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">
109 <text:p text:style-name="Table_20_Contents">123</text:p>
109 <text:p text:style-name="Table_20_Contents">123</text:p>
110 </table:table-cell>
110 </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">
112 <text:p text:style-name="P8">123</text:p>
112 <text:p text:style-name="P8">123</text:p>
113 </table:table-cell>
113 </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">
115 <text:p text:style-name="Table_20_Contents">123</text:p>
115 <text:p text:style-name="Table_20_Contents">123</text:p>
116 </table:table-cell>
116 </table:table-cell>
117 </table:table-row>
117 </table:table-row>
118 <table:table-row>
118 <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">
120 <text:p text:style-name="P7">1</text:p>
120 <text:p text:style-name="P7">1</text:p>
121 </table:table-cell>
121 </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">
123 <text:p text:style-name="Table_20_Contents">1</text:p>
123 <text:p text:style-name="Table_20_Contents">1</text:p>
124 </table:table-cell>
124 </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">
126 <text:p text:style-name="P8">1</text:p>
126 <text:p text:style-name="P8">1</text:p>
127 </table:table-cell>
127 </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">
129 <text:p text:style-name="Table_20_Contents">1</text:p>
129 <text:p text:style-name="Table_20_Contents">1</text:p>
130 </table:table-cell>
130 </table:table-cell>
131 </table:table-row>
131 </table:table-row>
@@ -139,59 +139,59 @@ spaces:</text:p>
139 <table:table-column table:style-name="Table3.D" />
139 <table:table-column table:style-name="Table3.D" />
140 <table:table-header-rows>
140 <table:table-header-rows>
141 <table:table-row>
141 <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">
143 <text:p text:style-name="P9">Right</text:p>
143 <text:p text:style-name="P9">Right</text:p>
144 </table:table-cell>
144 </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">
146 <text:p text:style-name="Table_20_Heading">Left</text:p>
146 <text:p text:style-name="Table_20_Heading">Left</text:p>
147 </table:table-cell>
147 </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">
149 <text:p text:style-name="P10">Center</text:p>
149 <text:p text:style-name="P10">Center</text:p>
150 </table:table-cell>
150 </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">
152 <text:p text:style-name="Table_20_Heading">Default</text:p>
152 <text:p text:style-name="Table_20_Heading">Default</text:p>
153 </table:table-cell>
153 </table:table-cell>
154 </table:table-row>
154 </table:table-row>
155 </table:table-header-rows>
155 </table:table-header-rows>
156 <table:table-row>
156 <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">
158 <text:p text:style-name="P11">12</text:p>
158 <text:p text:style-name="P11">12</text:p>
159 </table:table-cell>
159 </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">
161 <text:p text:style-name="Table_20_Contents">12</text:p>
161 <text:p text:style-name="Table_20_Contents">12</text:p>
162 </table:table-cell>
162 </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">
164 <text:p text:style-name="P12">12</text:p>
164 <text:p text:style-name="P12">12</text:p>
165 </table:table-cell>
165 </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">
167 <text:p text:style-name="Table_20_Contents">12</text:p>
167 <text:p text:style-name="Table_20_Contents">12</text:p>
168 </table:table-cell>
168 </table:table-cell>
169 </table:table-row>
169 </table:table-row>
170 <table:table-row>
170 <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">
172 <text:p text:style-name="P11">123</text:p>
172 <text:p text:style-name="P11">123</text:p>
173 </table:table-cell>
173 </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">
175 <text:p text:style-name="Table_20_Contents">123</text:p>
175 <text:p text:style-name="Table_20_Contents">123</text:p>
176 </table:table-cell>
176 </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">
178 <text:p text:style-name="P12">123</text:p>
178 <text:p text:style-name="P12">123</text:p>
179 </table:table-cell>
179 </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">
181 <text:p text:style-name="Table_20_Contents">123</text:p>
181 <text:p text:style-name="Table_20_Contents">123</text:p>
182 </table:table-cell>
182 </table:table-cell>
183 </table:table-row>
183 </table:table-row>
184 <table:table-row>
184 <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">
186 <text:p text:style-name="P11">1</text:p>
186 <text:p text:style-name="P11">1</text:p>
187 </table:table-cell>
187 </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">
189 <text:p text:style-name="Table_20_Contents">1</text:p>
189 <text:p text:style-name="Table_20_Contents">1</text:p>
190 </table:table-cell>
190 </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">
192 <text:p text:style-name="P12">1</text:p>
192 <text:p text:style-name="P12">1</text:p>
193 </table:table-cell>
193 </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">
195 <text:p text:style-name="Table_20_Contents">1</text:p>
195 <text:p text:style-name="Table_20_Contents">1</text:p>
196 </table:table-cell>
196 </table:table-cell>
197 </table:table-row>
197 </table:table-row>
@@ -206,46 +206,46 @@ caption:</text:p>
206 <table:table-column table:style-name="Table4.D" />
206 <table:table-column table:style-name="Table4.D" />
207 <table:table-header-rows>
207 <table:table-header-rows>
208 <table:table-row>
208 <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">
210 <text:p text:style-name="P13">Centered Header</text:p>
210 <text:p text:style-name="P13">Centered Header</text:p>
211 </table:table-cell>
211 </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">
213 <text:p text:style-name="Table_20_Heading">Left Aligned</text:p>
213 <text:p text:style-name="Table_20_Heading">Left Aligned</text:p>
214 </table:table-cell>
214 </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">
216 <text:p text:style-name="P14">Right Aligned</text:p>
216 <text:p text:style-name="P14">Right Aligned</text:p>
217 </table:table-cell>
217 </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">
219 <text:p text:style-name="Table_20_Heading">Default aligned</text:p>
219 <text:p text:style-name="Table_20_Heading">Default aligned</text:p>
220 </table:table-cell>
220 </table:table-cell>
221 </table:table-row>
221 </table:table-row>
222 </table:table-header-rows>
222 </table:table-header-rows>
223 <table:table-row>
223 <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">
225 <text:p text:style-name="P15">First</text:p>
225 <text:p text:style-name="P15">First</text:p>
226 </table:table-cell>
226 </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">
228 <text:p text:style-name="Table_20_Contents">row</text:p>
228 <text:p text:style-name="Table_20_Contents">row</text:p>
229 </table:table-cell>
229 </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">
231 <text:p text:style-name="P16">12.0</text:p>
231 <text:p text:style-name="P16">12.0</text:p>
232 </table:table-cell>
232 </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">
234 <text:p text:style-name="Table_20_Contents">Example of a row that spans
234 <text:p text:style-name="Table_20_Contents">Example of a row that spans
235 multiple lines.</text:p>
235 multiple lines.</text:p>
236 </table:table-cell>
236 </table:table-cell>
237 </table:table-row>
237 </table:table-row>
238 <table:table-row>
238 <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">
240 <text:p text:style-name="P15">Second</text:p>
240 <text:p text:style-name="P15">Second</text:p>
241 </table:table-cell>
241 </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">
243 <text:p text:style-name="Table_20_Contents">row</text:p>
243 <text:p text:style-name="Table_20_Contents">row</text:p>
244 </table:table-cell>
244 </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">
246 <text:p text:style-name="P16">5.0</text:p>
246 <text:p text:style-name="P16">5.0</text:p>
247 </table:table-cell>
247 </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">
249 <text:p text:style-name="Table_20_Contents">Here’s another one. Note the
249 <text:p text:style-name="Table_20_Contents">Here’s another one. Note the
250 blank line between rows.</text:p>
250 blank line between rows.</text:p>
251 </table:table-cell>
251 </table:table-cell>
@@ -262,46 +262,46 @@ caption:</text:p>
262 <table:table-column table:style-name="Table5.D" />
262 <table:table-column table:style-name="Table5.D" />
263 <table:table-header-rows>
263 <table:table-header-rows>
264 <table:table-row>
264 <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">
266 <text:p text:style-name="P17">Centered Header</text:p>
266 <text:p text:style-name="P17">Centered Header</text:p>
267 </table:table-cell>
267 </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">
269 <text:p text:style-name="Table_20_Heading">Left Aligned</text:p>
269 <text:p text:style-name="Table_20_Heading">Left Aligned</text:p>
270 </table:table-cell>
270 </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">
272 <text:p text:style-name="P18">Right Aligned</text:p>
272 <text:p text:style-name="P18">Right Aligned</text:p>
273 </table:table-cell>
273 </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">
275 <text:p text:style-name="Table_20_Heading">Default aligned</text:p>
275 <text:p text:style-name="Table_20_Heading">Default aligned</text:p>
276 </table:table-cell>
276 </table:table-cell>
277 </table:table-row>
277 </table:table-row>
278 </table:table-header-rows>
278 </table:table-header-rows>
279 <table:table-row>
279 <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">
281 <text:p text:style-name="P19">First</text:p>
281 <text:p text:style-name="P19">First</text:p>
282 </table:table-cell>
282 </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">
284 <text:p text:style-name="Table_20_Contents">row</text:p>
284 <text:p text:style-name="Table_20_Contents">row</text:p>
285 </table:table-cell>
285 </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">
287 <text:p text:style-name="P20">12.0</text:p>
287 <text:p text:style-name="P20">12.0</text:p>
288 </table:table-cell>
288 </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">
290 <text:p text:style-name="Table_20_Contents">Example of a row that spans
290 <text:p text:style-name="Table_20_Contents">Example of a row that spans
291 multiple lines.</text:p>
291 multiple lines.</text:p>
292 </table:table-cell>
292 </table:table-cell>
293 </table:table-row>
293 </table:table-row>
294 <table:table-row>
294 <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">
296 <text:p text:style-name="P19">Second</text:p>
296 <text:p text:style-name="P19">Second</text:p>
297 </table:table-cell>
297 </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">
299 <text:p text:style-name="Table_20_Contents">row</text:p>
299 <text:p text:style-name="Table_20_Contents">row</text:p>
300 </table:table-cell>
300 </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">
302 <text:p text:style-name="P20">5.0</text:p>
302 <text:p text:style-name="P20">5.0</text:p>
303 </table:table-cell>
303 </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">
305 <text:p text:style-name="Table_20_Contents">Here’s another one. Note the
305 <text:p text:style-name="Table_20_Contents">Here’s another one. Note the
306 blank line between rows.</text:p>
306 blank line between rows.</text:p>
307 </table:table-cell>
307 </table:table-cell>
@@ -315,44 +315,44 @@ headers:</text:p>
315 <table:table-column table:style-name="Table6.C" />
315 <table:table-column table:style-name="Table6.C" />
316 <table:table-column table:style-name="Table6.D" />
316 <table:table-column table:style-name="Table6.D" />
317 <table:table-row>
317 <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">
319 <text:p text:style-name="P24">12</text:p>
319 <text:p text:style-name="P24">12</text:p>
320 </table:table-cell>
320 </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">
322 <text:p text:style-name="Table_20_Contents">12</text:p>
322 <text:p text:style-name="Table_20_Contents">12</text:p>
323 </table:table-cell>
323 </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">
325 <text:p text:style-name="P25">12</text:p>
325 <text:p text:style-name="P25">12</text:p>
326 </table:table-cell>
326 </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">
328 <text:p text:style-name="P26">12</text:p>
328 <text:p text:style-name="P26">12</text:p>
329 </table:table-cell>
329 </table:table-cell>
330 </table:table-row>
330 </table:table-row>
331 <table:table-row>
331 <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">
333 <text:p text:style-name="P24">123</text:p>
333 <text:p text:style-name="P24">123</text:p>
334 </table:table-cell>
334 </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">
336 <text:p text:style-name="Table_20_Contents">123</text:p>
336 <text:p text:style-name="Table_20_Contents">123</text:p>
337 </table:table-cell>
337 </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">
339 <text:p text:style-name="P25">123</text:p>
339 <text:p text:style-name="P25">123</text:p>
340 </table:table-cell>
340 </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">
342 <text:p text:style-name="P26">123</text:p>
342 <text:p text:style-name="P26">123</text:p>
343 </table:table-cell>
343 </table:table-cell>
344 </table:table-row>
344 </table:table-row>
345 <table:table-row>
345 <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">
347 <text:p text:style-name="P24">1</text:p>
347 <text:p text:style-name="P24">1</text:p>
348 </table:table-cell>
348 </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">
350 <text:p text:style-name="Table_20_Contents">1</text:p>
350 <text:p text:style-name="Table_20_Contents">1</text:p>
351 </table:table-cell>
351 </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">
353 <text:p text:style-name="P25">1</text:p>
353 <text:p text:style-name="P25">1</text:p>
354 </table:table-cell>
354 </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">
356 <text:p text:style-name="P26">1</text:p>
356 <text:p text:style-name="P26">1</text:p>
357 </table:table-cell>
357 </table:table-cell>
358 </table:table-row>
358 </table:table-row>
@@ -365,31 +365,31 @@ headers:</text:p>
365 <table:table-column table:style-name="Table7.C" />
365 <table:table-column table:style-name="Table7.C" />
366 <table:table-column table:style-name="Table7.D" />
366 <table:table-column table:style-name="Table7.D" />
367 <table:table-row>
367 <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">
369 <text:p text:style-name="P29">First</text:p>
369 <text:p text:style-name="P29">First</text:p>
370 </table:table-cell>
370 </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">
372 <text:p text:style-name="Table_20_Contents">row</text:p>
372 <text:p text:style-name="Table_20_Contents">row</text:p>
373 </table:table-cell>
373 </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">
375 <text:p text:style-name="P30">12.0</text:p>
375 <text:p text:style-name="P30">12.0</text:p>
376 </table:table-cell>
376 </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">
378 <text:p text:style-name="Table_20_Contents">Example of a row that spans
378 <text:p text:style-name="Table_20_Contents">Example of a row that spans
379 multiple lines.</text:p>
379 multiple lines.</text:p>
380 </table:table-cell>
380 </table:table-cell>
381 </table:table-row>
381 </table:table-row>
382 <table:table-row>
382 <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">
384 <text:p text:style-name="P29">Second</text:p>
384 <text:p text:style-name="P29">Second</text:p>
385 </table:table-cell>
385 </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">
387 <text:p text:style-name="Table_20_Contents">row</text:p>
387 <text:p text:style-name="Table_20_Contents">row</text:p>
388 </table:table-cell>
388 </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">
390 <text:p text:style-name="P30">5.0</text:p>
390 <text:p text:style-name="P30">5.0</text:p>
391 </table:table-cell>
391 </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">
393 <text:p text:style-name="Table_20_Contents">Here’s another one. Note the
393 <text:p text:style-name="Table_20_Contents">Here’s another one. Note the
394 blank line between rows.</text:p>
394 blank line between rows.</text:p>
395 </table:table-cell>
395 </table:table-cell>