git.iko.soy/typeable/pandoc
on master help sign in
HTML writer: don't include alignment attribute for default table columns.
93a05dfJohn MacFarlane
src/Text/Pandoc/Writers/HTML.hs+5−2
compare with master
unifiedsplit
@@ -645,7 +645,7 @@ alignmentToString alignment = case alignment of
645 AlignLeft -> "left"
645 AlignLeft -> "left"
646 AlignRight -> "right"
646 AlignRight -> "right"
647 AlignCenter -> "center"
647 AlignCenter -> "center"
648− AlignDefault -> "left"
648+ AlignDefault -> ""
649
649
650tableItemToHtml :: WriterOptions
650tableItemToHtml :: WriterOptions
651 -> (Html -> Html)
651 -> (Html -> Html)
@@ -658,7 +658,10 @@ tableItemToHtml opts tag' align' item = do
658 let attribs = if writerHtml5 opts
658 let attribs = if writerHtml5 opts
659 then A.style (toValue $ "text-align: " ++ alignStr ++ ";")
659 then A.style (toValue $ "text-align: " ++ alignStr ++ ";")
660 else A.align (toValue alignStr)
660 else A.align (toValue alignStr)
661+ let tag'' = if null alignStr
662+ then tag'
663+ else tag' ! attribs
661− return $ (tag' ! attribs $ contents) >> nl opts
664+ return $ (tag'' $ contents) >> nl opts
662
665
663toListItems :: WriterOptions -> [Html] -> [Html]
666toListItems :: WriterOptions -> [Html] -> [Html]
664toListItems opts items = map (toListItem opts) items ++ [nl opts]
667toListItems opts items = map (toListItem opts) items ++ [nl opts]
tests/tables.html+14−14
@@ -6,7 +6,7 @@
6<th align="right">Right</th>
6<th align="right">Right</th>
7<th align="left">Left</th>
7<th align="left">Left</th>
8<th align="center">Center</th>
8<th align="center">Center</th>
9−<th align="left">Default</th>
9+<th>Default</th>
10</tr>
10</tr>
11</thead>
11</thead>
12<tbody>
12<tbody>
@@ -14,19 +14,19 @@
14<td align="right">12</td>
14<td align="right">12</td>
15<td align="left">12</td>
15<td align="left">12</td>
16<td align="center">12</td>
16<td align="center">12</td>
17−<td align="left">12</td>
17+<td>12</td>
18</tr>
18</tr>
19<tr class="even">
19<tr class="even">
20<td align="right">123</td>
20<td align="right">123</td>
21<td align="left">123</td>
21<td align="left">123</td>
22<td align="center">123</td>
22<td align="center">123</td>
23−<td align="left">123</td>
23+<td>123</td>
24</tr>
24</tr>
25<tr class="odd">
25<tr class="odd">
26<td align="right">1</td>
26<td align="right">1</td>
27<td align="left">1</td>
27<td align="left">1</td>
28<td align="center">1</td>
28<td align="center">1</td>
29−<td align="left">1</td>
29+<td>1</td>
30</tr>
30</tr>
31</tbody>
31</tbody>
32</table>
32</table>
@@ -37,7 +37,7 @@
37<th align="right">Right</th>
37<th align="right">Right</th>
38<th align="left">Left</th>
38<th align="left">Left</th>
39<th align="center">Center</th>
39<th align="center">Center</th>
40−<th align="left">Default</th>
40+<th>Default</th>
41</tr>
41</tr>
42</thead>
42</thead>
43<tbody>
43<tbody>
@@ -45,19 +45,19 @@
45<td align="right">12</td>
45<td align="right">12</td>
46<td align="left">12</td>
46<td align="left">12</td>
47<td align="center">12</td>
47<td align="center">12</td>
48−<td align="left">12</td>
48+<td>12</td>
49</tr>
49</tr>
50<tr class="even">
50<tr class="even">
51<td align="right">123</td>
51<td align="right">123</td>
52<td align="left">123</td>
52<td align="left">123</td>
53<td align="center">123</td>
53<td align="center">123</td>
54−<td align="left">123</td>
54+<td>123</td>
55</tr>
55</tr>
56<tr class="odd">
56<tr class="odd">
57<td align="right">1</td>
57<td align="right">1</td>
58<td align="left">1</td>
58<td align="left">1</td>
59<td align="center">1</td>
59<td align="center">1</td>
60−<td align="left">1</td>
60+<td>1</td>
61</tr>
61</tr>
62</tbody>
62</tbody>
63</table>
63</table>
@@ -69,7 +69,7 @@
69<th align="right">Right</th>
69<th align="right">Right</th>
70<th align="left">Left</th>
70<th align="left">Left</th>
71<th align="center">Center</th>
71<th align="center">Center</th>
72−<th align="left">Default</th>
72+<th>Default</th>
73</tr>
73</tr>
74</thead>
74</thead>
75<tbody>
75<tbody>
@@ -77,19 +77,19 @@
77<td align="right">12</td>
77<td align="right">12</td>
78<td align="left">12</td>
78<td align="left">12</td>
79<td align="center">12</td>
79<td align="center">12</td>
80−<td align="left">12</td>
80+<td>12</td>
81</tr>
81</tr>
82<tr class="even">
82<tr class="even">
83<td align="right">123</td>
83<td align="right">123</td>
84<td align="left">123</td>
84<td align="left">123</td>
85<td align="center">123</td>
85<td align="center">123</td>
86−<td align="left">123</td>
86+<td>123</td>
87</tr>
87</tr>
88<tr class="odd">
88<tr class="odd">
89<td align="right">1</td>
89<td align="right">1</td>
90<td align="left">1</td>
90<td align="left">1</td>
91<td align="center">1</td>
91<td align="center">1</td>
92−<td align="left">1</td>
92+<td>1</td>
93</tr>
93</tr>
94</tbody>
94</tbody>
95</table>
95</table>
@@ -192,13 +192,13 @@
192<td align="center">First</td>
192<td align="center">First</td>
193<td align="left">row</td>
193<td align="left">row</td>
194<td align="right">12.0</td>
194<td align="right">12.0</td>
195−<td align="left">Example of a row that spans multiple lines.</td>
195+<td>Example of a row that spans multiple lines.</td>
196</tr>
196</tr>
197<tr class="even">
197<tr class="even">
198<td align="center">Second</td>
198<td align="center">Second</td>
199<td align="left">row</td>
199<td align="left">row</td>
200<td align="right">5.0</td>
200<td align="right">5.0</td>
201−<td align="left">Here's another one. Note the blank line between rows.</td>
201+<td>Here's another one. Note the blank line between rows.</td>
202</tr>
202</tr>
203</tbody>
203</tbody>
204</table>
204</table>