Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed bug in mediawiki writer: improper closing tags in tables.

Browse source 
<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
This commit is contained in:
fiddlosopher 2009-01-24 19:59:00 +00:00
parent 2806aee9b2
commit ed58846497
2 changed files with 73 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Text/Pandoc/Writers/MediaWiki.hs
View file

@ -295,7 +295,7 @@ tableItemToMediaWiki opts tag' align' width' item = do
if width' /= 0
then " style=\"width: " ++ (show (truncate (100 * width') :: Integer)) ++ "%;\""
else ""
return $ "<" ++ tag' ++ attrib ++ ">" ++ contents ++ "<" ++ tag' ++ ">"
return $ "<" ++ tag' ++ attrib ++ ">" ++ contents ++ "</" ++ tag' ++ ">"
-- | Convert list of Pandoc block elements to MediaWiki.
blockListToMediaWiki :: WriterOptions -- ^ Options

144
tests/tables.mediawiki
View file

@ -2,122 +2,122 @@ Simple table with caption:
<table>
<caption>Demonstration of simple table syntax.</caption><tr>
<th align="right" style="width: 15%;">Right<th>
<th align="left" style="width: 8%;">Left<th>
<th align="center" style="width: 16%;">Center<th>
<th align="left" style="width: 12%;">Default<th>
<th align="right" style="width: 15%;">Right</th>
<th align="left" style="width: 8%;">Left</th>
<th align="center" style="width: 16%;">Center</th>
<th align="left" style="width: 12%;">Default</th>
</tr><tr>
<td align="right">12<td>
<td align="left">12<td>
<td align="center">12<td>
<td align="left">12<td>
<td align="right">12</td>
<td align="left">12</td>
<td align="center">12</td>
<td align="left">12</td>
</tr>
<tr>
<td align="right">123<td>
<td align="left">123<td>
<td align="center">123<td>
<td align="left">123<td>
<td align="right">123</td>
<td align="left">123</td>
<td align="center">123</td>
<td align="left">123</td>
</tr>
<tr>
<td align="right">1<td>
<td align="left">1<td>
<td align="center">1<td>
<td align="left">1<td>
<td align="right">1</td>
<td align="left">1</td>
<td align="center">1</td>
<td align="left">1</td>
</tr>
</table>
Simple table without caption:
<table>
<tr>
<th align="right" style="width: 15%;">Right<th>
<th align="left" style="width: 8%;">Left<th>
<th align="center" style="width: 16%;">Center<th>
<th align="left" style="width: 12%;">Default<th>
<th align="right" style="width: 15%;">Right</th>
<th align="left" style="width: 8%;">Left</th>
<th align="center" style="width: 16%;">Center</th>
<th align="left" style="width: 12%;">Default</th>
</tr><tr>
<td align="right">12<td>
<td align="left">12<td>
<td align="center">12<td>
<td align="left">12<td>
<td align="right">12</td>
<td align="left">12</td>
<td align="center">12</td>
<td align="left">12</td>
</tr>
<tr>
<td align="right">123<td>
<td align="left">123<td>
<td align="center">123<td>
<td align="left">123<td>
<td align="right">123</td>
<td align="left">123</td>
<td align="center">123</td>
<td align="left">123</td>
</tr>
<tr>
<td align="right">1<td>
<td align="left">1<td>
<td align="center">1<td>
<td align="left">1<td>
<td align="right">1</td>
<td align="left">1</td>
<td align="center">1</td>
<td align="left">1</td>
</tr>
</table>
Simple table indented two spaces:
<table>
<caption>Demonstration of simple table syntax.</caption><tr>
<th align="right" style="width: 15%;">Right<th>
<th align="left" style="width: 8%;">Left<th>
<th align="center" style="width: 16%;">Center<th>
<th align="left" style="width: 12%;">Default<th>
<th align="right" style="width: 15%;">Right</th>
<th align="left" style="width: 8%;">Left</th>
<th align="center" style="width: 16%;">Center</th>
<th align="left" style="width: 12%;">Default</th>
</tr><tr>
<td align="right">12<td>
<td align="left">12<td>
<td align="center">12<td>
<td align="left">12<td>
<td align="right">12</td>
<td align="left">12</td>
<td align="center">12</td>
<td align="left">12</td>
</tr>
<tr>
<td align="right">123<td>
<td align="left">123<td>
<td align="center">123<td>
<td align="left">123<td>
<td align="right">123</td>
<td align="left">123</td>
<td align="center">123</td>
<td align="left">123</td>
</tr>
<tr>
<td align="right">1<td>
<td align="left">1<td>
<td align="center">1<td>
<td align="left">1<td>
<td align="right">1</td>
<td align="left">1</td>
<td align="center">1</td>
<td align="left">1</td>
</tr>
</table>
Multiline table with caption:
<table>
<caption>Here's the caption. It may span multiple lines.</caption><tr>
<th align="center" style="width: 15%;">Centered Header<th>
<th align="left" style="width: 13%;">Left Aligned<th>
<th align="right" style="width: 16%;">Right Aligned<th>
<th align="left" style="width: 33%;">Default aligned<th>
<th align="center" style="width: 15%;">Centered Header</th>
<th align="left" style="width: 13%;">Left Aligned</th>
<th align="right" style="width: 16%;">Right Aligned</th>
<th align="left" style="width: 33%;">Default aligned</th>
</tr><tr>
<td align="center">First<td>
<td align="left">row<td>
<td align="right">12.0<td>
<td align="left">Example of a row that spans multiple lines.<td>
<td align="center">First</td>
<td align="left">row</td>
<td align="right">12.0</td>
<td align="left">Example of a row that spans multiple lines.</td>
</tr>
<tr>
<td align="center">Second<td>
<td align="left">row<td>
<td align="right">5.0<td>
<td align="left">Here's another one. Note the blank line between rows.<td>
<td align="center">Second</td>
<td align="left">row</td>
<td align="right">5.0</td>
<td align="left">Here's another one. Note the blank line between rows.</td>
</tr>
</table>
Multiline table without caption:
<table>
<tr>
<th align="center" style="width: 15%;">Centered Header<th>
<th align="left" style="width: 13%;">Left Aligned<th>
<th align="right" style="width: 16%;">Right Aligned<th>
<th align="left" style="width: 33%;">Default aligned<th>
<th align="center" style="width: 15%;">Centered Header</th>
<th align="left" style="width: 13%;">Left Aligned</th>
<th align="right" style="width: 16%;">Right Aligned</th>
<th align="left" style="width: 33%;">Default aligned</th>
</tr><tr>
<td align="center">First<td>
<td align="left">row<td>
<td align="right">12.0<td>
<td align="left">Example of a row that spans multiple lines.<td>
<td align="center">First</td>
<td align="left">row</td>
<td align="right">12.0</td>
<td align="left">Example of a row that spans multiple lines.</td>
</tr>
<tr>
<td align="center">Second<td>
<td align="left">row<td>
<td align="right">5.0<td>
<td align="left">Here's another one. Note the blank line between rows.<td>
<td align="center">Second</td>
<td align="left">row</td>
<td align="right">5.0</td>
<td align="left">Here's another one. Note the blank line between rows.</td>
</tr>
</table>