From ce509be57a1209367d71a4cd5959f0478a5b2294 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 14 Sep 2012 10:55:16 -0400 Subject: MediaWiki reader: Table improvements, added simple table tests. --- tests/mediawiki-reader.native | 19 ++++++++++++++++++- tests/mediawiki-reader.wiki | 26 ++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/mediawiki-reader.native b/tests/mediawiki-reader.native index 2e8c9fdec..8b608fb17 100644 --- a/tests/mediawiki-reader.native +++ b/tests/mediawiki-reader.native @@ -173,4 +173,21 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) ,RawBlock "mediawiki" "{{Welcome}}" ,RawBlock "mediawiki" "{{Foo:Bar}}" ,RawBlock "mediawiki" "{{Thankyou|all your effort|Me}}" -,Para [Str "Written",Space,RawInline "mediawiki" "{{{date}}}",Space,Str "by",Space,RawInline "mediawiki" "{{{name}}}",Str "."]] +,Para [Str "Written",Space,RawInline "mediawiki" "{{{date}}}",Space,Str "by",Space,RawInline "mediawiki" "{{{name}}}",Str "."] +,Header 2 [Str "tables"] +,Table [] [AlignDefault,AlignDefault] [0.0,0.0] + [[] + ,[]] + [[[Para [Str "Orange"]] + ,[Para [Str "Apple"]]] + ,[[Para [Str "Bread"]] + ,[Para [Str "Pie"]]] + ,[[Para [Str "Butter"]] + ,[Para [Str "Ice",Space,Str "cream"]]]] +,Table [Str "Food",Space,Str "complements"] [AlignDefault,AlignDefault] [0.0,0.0] + [[Para [Str "Orange"]] + ,[Para [Str "Apple"]]] + [[[Para [Str "Bread"]] + ,[Para [Str "Pie"]]] + ,[[Para [Str "Butter"]] + ,[Para [Str "Ice",Space,Str "cream"]]]]] diff --git a/tests/mediawiki-reader.wiki b/tests/mediawiki-reader.wiki index 50b315d71..655c8313e 100644 --- a/tests/mediawiki-reader.wiki +++ b/tests/mediawiki-reader.wiki @@ -281,3 +281,29 @@ Not
preformatted Written {{{date}}} by {{{name}}}. +== tables == + +{| +|- +|Orange +|Apple +|- +|Bread +|Pie +|- +|Butter +|Ice cream +|} + +{| +|+Food complements +!Orange +!Apple +|- +|Bread +|Pie +|- +!Butter +|Ice cream +|} + -- cgit v1.2.3