diff options
-rw-r--r-- | Text/Pandoc/Writers/MediaWiki.hs | 2 | ||||
-rw-r--r-- | tests/tables.mediawiki | 144 |
2 files changed, 73 insertions, 73 deletions
diff --git a/Text/Pandoc/Writers/MediaWiki.hs b/Text/Pandoc/Writers/MediaWiki.hs index d25cfaed0..c5f6b3bf1 100644 --- a/Text/Pandoc/Writers/MediaWiki.hs +++ b/Text/Pandoc/Writers/MediaWiki.hs @@ -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 diff --git a/tests/tables.mediawiki b/tests/tables.mediawiki index abe1cf530..989159846 100644 --- a/tests/tables.mediawiki +++ b/tests/tables.mediawiki @@ -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> |