git.iko.soy/typeable/pandoc
on master help sign in
Fixed bug in mediawiki writer: improper closing tags in tables.

<th> instead of </th>, <td> instead of </td>. Thanks to Benct Philip Jonsson for reporting the bug. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1524 788f1e2b-df1e-0410-8736-df70ead52e1b

commited588464971fd0f13c241e4176731711019f369b authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSat 24 Jan 2009, 19:59 (18 years ago) parent2806aee
2 files changed+73−73
Text/Pandoc/Writers/MediaWiki.hs+1−1 tests/tables.mediawiki+72−72
Text/Pandoc/Writers/MediaWiki.hs+1−1
@@ -295,7 +295,7 @@ tableItemToMediaWiki opts tag' align' width' item = do
295295 if width' /= 0
296296 then " style=\"width: " ++ (show (truncate (100 * width') :: Integer)) ++ "%;\""
297297 else ""
298− return $ "<" ++ tag' ++ attrib ++ ">" ++ contents ++ "<" ++ tag' ++ ">"
298+ return $ "<" ++ tag' ++ attrib ++ ">" ++ contents ++ "</" ++ tag' ++ ">"
299299
300300-- | Convert list of Pandoc block elements to MediaWiki.
301301blockListToMediaWiki :: WriterOptions -- ^ Options
tests/tables.mediawiki+72−72
@@ -2,122 +2,122 @@ Simple table with caption:
22
33<table>
44<caption>Demonstration of simple table syntax.</caption><tr>
5−<th align="right" style="width: 15%;">Right<th>
6−<th align="left" style="width: 8%;">Left<th>
7−<th align="center" style="width: 16%;">Center<th>
8−<th align="left" style="width: 12%;">Default<th>
5+<th align="right" style="width: 15%;">Right</th>
6+<th align="left" style="width: 8%;">Left</th>
7+<th align="center" style="width: 16%;">Center</th>
8+<th align="left" style="width: 12%;">Default</th>
99</tr><tr>
10−<td align="right">12<td>
11−<td align="left">12<td>
12−<td align="center">12<td>
13−<td align="left">12<td>
10+<td align="right">12</td>
11+<td align="left">12</td>
12+<td align="center">12</td>
13+<td align="left">12</td>
1414</tr>
1515<tr>
16−<td align="right">123<td>
17−<td align="left">123<td>
18−<td align="center">123<td>
19−<td align="left">123<td>
16+<td align="right">123</td>
17+<td align="left">123</td>
18+<td align="center">123</td>
19+<td align="left">123</td>
2020</tr>
2121<tr>
22−<td align="right">1<td>
23−<td align="left">1<td>
24−<td align="center">1<td>
25−<td align="left">1<td>
22+<td align="right">1</td>
23+<td align="left">1</td>
24+<td align="center">1</td>
25+<td align="left">1</td>
2626</tr>
2727</table>
2828Simple table without caption:
2929
3030<table>
3131<tr>
32−<th align="right" style="width: 15%;">Right<th>
33−<th align="left" style="width: 8%;">Left<th>
34−<th align="center" style="width: 16%;">Center<th>
35−<th align="left" style="width: 12%;">Default<th>
32+<th align="right" style="width: 15%;">Right</th>
33+<th align="left" style="width: 8%;">Left</th>
34+<th align="center" style="width: 16%;">Center</th>
35+<th align="left" style="width: 12%;">Default</th>
3636</tr><tr>
37−<td align="right">12<td>
38−<td align="left">12<td>
39−<td align="center">12<td>
40−<td align="left">12<td>
37+<td align="right">12</td>
38+<td align="left">12</td>
39+<td align="center">12</td>
40+<td align="left">12</td>
4141</tr>
4242<tr>
43−<td align="right">123<td>
44−<td align="left">123<td>
45−<td align="center">123<td>
46−<td align="left">123<td>
43+<td align="right">123</td>
44+<td align="left">123</td>
45+<td align="center">123</td>
46+<td align="left">123</td>
4747</tr>
4848<tr>
49−<td align="right">1<td>
50−<td align="left">1<td>
51−<td align="center">1<td>
52−<td align="left">1<td>
49+<td align="right">1</td>
50+<td align="left">1</td>
51+<td align="center">1</td>
52+<td align="left">1</td>
5353</tr>
5454</table>
5555Simple table indented two spaces:
5656
5757<table>
5858<caption>Demonstration of simple table syntax.</caption><tr>
59−<th align="right" style="width: 15%;">Right<th>
60−<th align="left" style="width: 8%;">Left<th>
61−<th align="center" style="width: 16%;">Center<th>
62−<th align="left" style="width: 12%;">Default<th>
59+<th align="right" style="width: 15%;">Right</th>
60+<th align="left" style="width: 8%;">Left</th>
61+<th align="center" style="width: 16%;">Center</th>
62+<th align="left" style="width: 12%;">Default</th>
6363</tr><tr>
64−<td align="right">12<td>
65−<td align="left">12<td>
66−<td align="center">12<td>
67−<td align="left">12<td>
64+<td align="right">12</td>
65+<td align="left">12</td>
66+<td align="center">12</td>
67+<td align="left">12</td>
6868</tr>
6969<tr>
70−<td align="right">123<td>
71−<td align="left">123<td>
72−<td align="center">123<td>
73−<td align="left">123<td>
70+<td align="right">123</td>
71+<td align="left">123</td>
72+<td align="center">123</td>
73+<td align="left">123</td>
7474</tr>
7575<tr>
76−<td align="right">1<td>
77−<td align="left">1<td>
78−<td align="center">1<td>
79−<td align="left">1<td>
76+<td align="right">1</td>
77+<td align="left">1</td>
78+<td align="center">1</td>
79+<td align="left">1</td>
8080</tr>
8181</table>
8282Multiline table with caption:
8383
8484<table>
8585<caption>Here's the caption. It may span multiple lines.</caption><tr>
86−<th align="center" style="width: 15%;">Centered Header<th>
87−<th align="left" style="width: 13%;">Left Aligned<th>
88−<th align="right" style="width: 16%;">Right Aligned<th>
89−<th align="left" style="width: 33%;">Default aligned<th>
86+<th align="center" style="width: 15%;">Centered Header</th>
87+<th align="left" style="width: 13%;">Left Aligned</th>
88+<th align="right" style="width: 16%;">Right Aligned</th>
89+<th align="left" style="width: 33%;">Default aligned</th>
9090</tr><tr>
91−<td align="center">First<td>
92−<td align="left">row<td>
93−<td align="right">12.0<td>
94−<td align="left">Example of a row that spans multiple lines.<td>
91+<td align="center">First</td>
92+<td align="left">row</td>
93+<td align="right">12.0</td>
94+<td align="left">Example of a row that spans multiple lines.</td>
9595</tr>
9696<tr>
97−<td align="center">Second<td>
98−<td align="left">row<td>
99−<td align="right">5.0<td>
100−<td align="left">Here's another one. Note the blank line between rows.<td>
97+<td align="center">Second</td>
98+<td align="left">row</td>
99+<td align="right">5.0</td>
100+<td align="left">Here's another one. Note the blank line between rows.</td>
101101</tr>
102102</table>
103103Multiline table without caption:
104104
105105<table>
106106<tr>
107−<th align="center" style="width: 15%;">Centered Header<th>
108−<th align="left" style="width: 13%;">Left Aligned<th>
109−<th align="right" style="width: 16%;">Right Aligned<th>
110−<th align="left" style="width: 33%;">Default aligned<th>
107+<th align="center" style="width: 15%;">Centered Header</th>
108+<th align="left" style="width: 13%;">Left Aligned</th>
109+<th align="right" style="width: 16%;">Right Aligned</th>
110+<th align="left" style="width: 33%;">Default aligned</th>
111111</tr><tr>
112−<td align="center">First<td>
113−<td align="left">row<td>
114−<td align="right">12.0<td>
115−<td align="left">Example of a row that spans multiple lines.<td>
112+<td align="center">First</td>
113+<td align="left">row</td>
114+<td align="right">12.0</td>
115+<td align="left">Example of a row that spans multiple lines.</td>
116116</tr>
117117<tr>
118−<td align="center">Second<td>
119−<td align="left">row<td>
120−<td align="right">5.0<td>
121−<td align="left">Here's another one. Note the blank line between rows.<td>
118+<td align="center">Second</td>
119+<td align="left">row</td>
120+<td align="right">5.0</td>
121+<td align="left">Here's another one. Note the blank line between rows.</td>
122122</tr>
123123</table>