diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Tests/Old.hs | 7 | ||||
| -rw-r--r-- | tests/latex-reader.latex | 5 | ||||
| -rw-r--r-- | tests/latex-reader.native | 3 | ||||
| -rw-r--r-- | tests/mediawiki-reader.native | 241 | ||||
| -rw-r--r-- | tests/mediawiki-reader.wiki | 369 | ||||
| -rw-r--r-- | tests/tables.latex | 108 | ||||
| -rw-r--r-- | tests/textile-reader.native | 2 | ||||
| -rw-r--r-- | tests/writer.context | 2 | ||||
| -rw-r--r-- | tests/writer.html | 15 | ||||
| -rw-r--r-- | tests/writer.latex | 2 |
10 files changed, 687 insertions, 67 deletions
diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs index 8899fef6f..5360126c2 100644 --- a/tests/Tests/Old.hs +++ b/tests/Tests/Old.hs @@ -119,9 +119,14 @@ tests = [ testGroup "markdown" , fb2WriterTest "math" [] "fb2.math.markdown" "fb2.math.fb2" , fb2WriterTest "testsuite" [] "testsuite.native" "writer.fb2" ] + , testGroup "mediawiki" + [ testGroup "writer" $ writerTests "mediawiki" + , test "reader" ["-r", "mediawiki", "-w", "native", "-s"] + "mediawiki-reader.wiki" "mediawiki-reader.native" + ] , testGroup "other writers" $ map (\f -> testGroup f $ writerTests f) [ "opendocument" , "context" , "texinfo" - , "man" , "plain" , "mediawiki", "rtf", "org", "asciidoc" + , "man" , "plain" , "rtf", "org", "asciidoc" ] ] diff --git a/tests/latex-reader.latex b/tests/latex-reader.latex index cd424baec..dd7854eb1 100644 --- a/tests/latex-reader.latex +++ b/tests/latex-reader.latex @@ -155,6 +155,11 @@ And: These should not be escaped: \$ \\ \> \[ \{ \end{verbatim} + +\begin{obeylines} +this has \emph{two +lines} +\end{obeylines} \begin{center}\rule{3in}{0.4pt}\end{center} \section{Lists} diff --git a/tests/latex-reader.native b/tests/latex-reader.native index 2873529ae..b7cf39bc3 100644 --- a/tests/latex-reader.native +++ b/tests/latex-reader.native @@ -57,6 +57,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA ,CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n print \"working\";\n}\n\nthis code block is indented by one tab" ,Para [Str "And:"] ,CodeBlock ("",[],[]) " this code block is indented by two tabs\n\nThese should not be escaped: \\$ \\\\ \\> \\[ \\{" +,Para [Str "this",Space,Str "has",Space,Emph [Str "two",LineBreak,Str "lines"]] ,HorizontalRule ,Header 1 [Str "Lists"] ,Header 2 [Str "Unordered"] @@ -301,7 +302,7 @@ Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docA ,Para [Str "4",Space,Str "<",Space,Str "5."] ,Para [Str "6",Space,Str ">",Space,Str "5."] ,Para [Str "Backslash:",Space,Str "\\"] -,Para [Str "Backtick:",Space,Str "`"] +,Para [Str "Backtick:",Space,Str "\8216"] ,Para [Str "Asterisk:",Space,Str "*"] ,Para [Str "Underscore:",Space,Str "_"] ,Para [Str "Left",Space,Str "brace:",Space,Str "{"] diff --git a/tests/mediawiki-reader.native b/tests/mediawiki-reader.native new file mode 100644 index 000000000..122b52545 --- /dev/null +++ b/tests/mediawiki-reader.native @@ -0,0 +1,241 @@ +Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) +[Header 1 [Str "header"] +,Header 2 [Str "header",Space,Str "level",Space,Str "two"] +,Header 3 [Str "header",Space,Str "level",Space,Str "3"] +,Header 4 [Str "header",Space,Emph [Str "level"],Space,Str "four"] +,Header 5 [Str "header",Space,Str "level",Space,Str "5"] +,Header 6 [Str "header",Space,Str "level",Space,Str "6"] +,Para [Str "=======",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "========"] +,Para [Code ("",[],[]) "==\160not\160a\160header\160=="] +,Header 2 [Str "emph",Space,Str "and",Space,Str "strong"] +,Para [Emph [Str "emph"],Space,Strong [Str "strong"]] +,Para [Strong [Emph [Str "strong",Space,Str "and",Space,Str "emph"]]] +,Para [Strong [Emph [Str "emph",Space,Str "inside"],Space,Str "strong"]] +,Para [Strong [Str "strong",Space,Str "with",Space,Emph [Str "emph"]]] +,Para [Emph [Strong [Str "strong",Space,Str "inside"],Space,Str "emph"]] +,Header 2 [Str "horizontal",Space,Str "rule"] +,Para [Str "top"] +,HorizontalRule +,Para [Str "bottom"] +,HorizontalRule +,Header 2 [Str "nowiki"] +,Para [Str "''not",Space,Str "emph''"] +,Header 2 [Str "strikeout"] +,Para [Strikeout [Str "This",Space,Str "is",Space,Emph [Str "struck",Space,Str "out"]]] +,Header 2 [Str "entities"] +,Para [Str "hi",Space,Str "&",Space,Str "low"] +,Para [Str "hi",Space,Str "&",Space,Str "low"] +,Para [Str "G\246del"] +,Para [Str "\777\2730"] +,Header 2 [Str "comments"] +,Para [Str "inline",Space,Str "comment"] +,Para [Str "between",Space,Str "blocks"] +,Header 2 [Str "linebreaks"] +,Para [Str "hi",LineBreak,Str "there"] +,Para [Str "hi",LineBreak,Str "there"] +,Header 2 [Str ":",Space,Str "indents"] +,Para [Str "hi"] +,DefinitionList + [([], + [[Plain [Str "there"]]])] +,Para [Str "bud"] +,Para [Str "hi"] +,DefinitionList + [([], + [[DefinitionList + [([], + [[Plain [Str "there"]]])]]])] +,Para [Str "bud"] +,Header 2 [Str "p",Space,Str "tags"] +,Para [Str "hi",Space,Str "there"] +,Para [Str "bud"] +,Para [Str "another"] +,Header 2 [Str "raw",Space,Str "html"] +,Para [Str "hi",Space,RawInline "html" "<span style=\"color:red\">",Emph [Str "there"],RawInline "html" "</span>",Str "."] +,Para [RawInline "html" "<ins>",Str "inserted",RawInline "html" "</ins>"] +,RawBlock "html" "<div class=\"special\">" +,Para [Str "hi",Space,Emph [Str "there"]] +,RawBlock "html" "</div>" +,Header 2 [Str "sup,",Space,Str "sub,",Space,Str "del"] +,Para [Str "H",Subscript [Str "2"],Str "O",Space,Str "base",Superscript [Emph [Str "exponent"]],Space,Strikeout [Str "hello"]] +,Header 2 [Str "inline",Space,Str "code"] +,Para [Code ("",[],[]) "*\8594*",Space,Code ("",[],[]) "typed",Space,Code ("",["haskell"],[]) ">>="] +,Header 2 [Str "code",Space,Str "blocks"] +,CodeBlock ("",[],[]) "case xs of\n (_:_) -> reverse xs\n [] -> ['*']" +,CodeBlock ("",["haskell"],[]) "case xs of\n (_:_) -> reverse xs\n [] -> ['*']" +,CodeBlock ("",["ruby","numberLines"],[("startFrom","100")]) "widgets.each do |w|\n print w.price\nend" +,Header 2 [Str "block",Space,Str "quotes"] +,Para [Str "Regular",Space,Str "paragraph"] +,BlockQuote + [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote."] + ,Para [Str "With",Space,Str "two",Space,Str "paragraphs."]] +,Para [Str "Nother",Space,Str "paragraph."] +,Header 2 [Str "external",Space,Str "links"] +,Para [Link [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")] +,Para [Link [Str "http://johnmacfarlane.net/pandoc/"] ("http://johnmacfarlane.net/pandoc/","")] +,Para [Link [Str "1"] ("http://google.com",""),Space,Link [Str "2"] ("http://yahoo.com","")] +,Para [Link [Str "email",Space,Str "me"] ("mailto:info@example.org","")] +,Header 2 [Str "internal",Space,Str "links"] +,Para [Link [Str "Help"] ("Help","wikilink")] +,Para [Link [Str "the",Space,Str "help",Space,Str "page"] ("Help","wikilink")] +,Para [Link [Str "Helpers"] ("Help","wikilink")] +,Para [Link [Str "Help"] ("Help","wikilink"),Str "ers"] +,Para [Link [Str "Contents"] ("Help:Contents","wikilink")] +,Para [Link [Str "#My",Space,Str "anchor"] ("#My_anchor","wikilink")] +,Para [Link [Str "and",Space,Str "text"] ("Page#with_anchor","wikilink")] +,Header 2 [Str "images"] +,Para [Image [Str "caption"] ("example.jpg","image")] +,Para [Image [Str "the",Space,Emph [Str "caption"],Space,Str "with",Space,Link [Str "external",Space,Str "link"] ("http://google.com","")] ("example.jpg","image")] +,Para [Image [Str "caption"] ("example.jpg","image")] +,Para [Image [Str "example.jpg"] ("example.jpg","image")] +,Header 2 [Str "lists"] +,BulletList + [[Plain [Str "Start",Space,Str "each",Space,Str "line"]] + ,[Plain [Str "with",Space,Str "an",Space,Str "asterisk",Space,Str "(*)."] + ,BulletList + [[Plain [Str "More",Space,Str "asterisks",Space,Str "gives",Space,Str "deeper"] + ,BulletList + [[Plain [Str "and",Space,Str "deeper",Space,Str "levels."]]]]]] + ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels."] + ,BulletList + [[BulletList + [[Plain [Str "But",Space,Str "jumping",Space,Str "levels",Space,Str "creates",Space,Str "empty",Space,Str "space."]]]]]]] +,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "ends",Space,Str "the",Space,Str "list."] +,OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "Start",Space,Str "each",Space,Str "line"]] + ,[Plain [Str "with",Space,Str "a",Space,Str "number",Space,Str "sign",Space,Str "(#)."] + ,OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "More",Space,Str "number",Space,Str "signs",Space,Str "gives",Space,Str "deeper"] + ,OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "and",Space,Str "deeper"]] + ,[Plain [Str "levels."]]]]]] + ,[Plain [Str "Line",Space,Str "breaks",LineBreak,Str "don't",Space,Str "break",Space,Str "levels."] + ,OrderedList (1,DefaultStyle,DefaultDelim) + [[OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "But",Space,Str "jumping",Space,Str "levels",Space,Str "creates",Space,Str "empty",Space,Str "space."]]]]]] + ,[Plain [Str "Blank",Space,Str "lines"]]] +,OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "end",Space,Str "the",Space,Str "list",Space,Str "and",Space,Str "start",Space,Str "another."]]] +,Para [Str "Any",Space,Str "other",Space,Str "start",Space,Str "also",Space,Str "ends",Space,Str "the",Space,Str "list."] +,DefinitionList + [([Str "item",Space,Str "1"], + [[Plain [Str "definition",Space,Str "1"]]]) + ,([Str "item",Space,Str "2"], + [[Plain [Str "definition",Space,Str "2-1"]] + ,[Plain [Str "definition",Space,Str "2-2"]]])] +,OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "one"]] + ,[Plain [Str "two"] + ,BulletList + [[Plain [Str "two",Space,Str "point",Space,Str "one"]] + ,[Plain [Str "two",Space,Str "point",Space,Str "two"]]]] + ,[Plain [Str "three"] + ,DefinitionList + [([Str "three",Space,Str "item",Space,Str "one"], + [[Plain [Str "three",Space,Str "def",Space,Str "one"]]])]] + ,[Plain [Str "four"] + ,DefinitionList + [([], + [[Plain [Str "four",Space,Str "def",Space,Str "one"]] + ,[Plain [Str "this",Space,Str "looks",Space,Str "like",Space,Str "a",Space,Str "continuation"]] + ,[Plain [Str "and",Space,Str "is",Space,Str "often",Space,Str "used"]] + ,[Plain [Str "instead",LineBreak,Str "of",Space,Str "<br/>"]]])]] + ,[Plain [RawInline "mediawiki" "{{{template\n|author=John\n|title=My Book\n}}}"] + ,OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "five",Space,Str "sub",Space,Str "1"] + ,OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "five",Space,Str "sub",Space,Str "1",Space,Str "sub",Space,Str "1"]]]] + ,[Plain [Str "five",Space,Str "sub",Space,Str "2"]]]]] +,OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "list",Space,Str "item",Space,Emph [Str "emph"]] + ,OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "list",Space,Str "item",Space,Str "B1"]] + ,[Plain [Str "list",Space,Str "item",Space,Str "B2"]]] + ,Para [Str "continuing",Space,Str "list",Space,Str "item",Space,Str "A1"]] + ,[Plain [Str "list",Space,Str "item",Space,Str "A2"]]] +,OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "abc"]] + ,[Plain [Str "def"]] + ,[Plain [Str "ghi"]]] +,OrderedList (9,DefaultStyle,DefaultDelim) + [[Plain [Str "Amsterdam"]] + ,[Plain [Str "Rotterdam"]] + ,[Plain [Str "The",Space,Str "Hague"]]] +,Header 2 [Str "math"] +,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Math InlineMath "x=\\frac{y^\\pi}{z}",Str "."] +,Header 2 [Str "preformatted",Space,Str "blocks"] +,Para [Code ("",[],[]) "Start\160each\160line\160with\160a\160space.",LineBreak,Code ("",[],[]) "Text\160is\160",Strong [Code ("",[],[]) "preformatted"],Code ("",[],[]) "\160and",LineBreak,Emph [Code ("",[],[]) "markups"],Code ("",[],[]) "\160",Strong [Emph [Code ("",[],[]) "can"]],Code ("",[],[]) "\160be\160done."] +,Para [Code ("",[],[]) "\160hell\160\160\160\160\160\160yeah"] +,Para [Code ("",[],[]) "Start\160with\160a\160space\160in\160the\160first\160column,",LineBreak,Code ("",[],[]) "(before\160the\160<nowiki>).",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "Then\160your\160block\160format\160will\160be",LineBreak,Code ("",[],[]) "\160\160\160\160maintained.",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "This\160is\160good\160for\160copying\160in\160code\160blocks:",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "def\160function():",LineBreak,Code ("",[],[]) "\160\160\160\160\"\"\"documentation\160string\"\"\"",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "\160\160\160\160if\160True:",LineBreak,Code ("",[],[]) "\160\160\160\160\160\160\160\160print\160True",LineBreak,Code ("",[],[]) "\160\160\160\160else:",LineBreak,Code ("",[],[]) "\160\160\160\160\160\160\160\160print\160False"] +,Para [Str "Not"] +,RawBlock "html" "<hr/>" +,Para [Str "preformatted"] +,Header 2 [Str "templates"] +,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 "."] +,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"]]]] +,Table [Str "Food",Space,Str "complements"] [AlignDefault,AlignDefault] [0.0,0.0] + [[Para [Str "Orange"]] + ,[Para [Str "Apple"]]] + [[[Para [Str "Bread"] + ,Para [Str "and",Space,Str "cheese"]] + ,[Para [Str "Pie"] + ,OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "apple"]] + ,[Plain [Str "carrot"]]]]]] +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [[] + ,[] + ,[]] + [[[Para [Str "Orange"]] + ,[Para [Str "Apple"]] + ,[Para [Str "more"]]] + ,[[Para [Str "Bread"]] + ,[Para [Str "Pie"]] + ,[Para [Str "more"]]] + ,[[Para [Str "Butter"]] + ,[Para [Str "Ice",Space,Str "cream"]] + ,[Para [Str "and",Space,Str "more"]]]] +,Table [] [AlignLeft,AlignRight,AlignCenter] [0.25,0.125,0.125] + [[Para [Str "Left"]] + ,[Para [Str "Right"]] + ,[Para [Str "Center"]]] + [[[Para [Str "left"]] + ,[Para [Str "15.00"]] + ,[Para [Str "centered"]]] + ,[[Para [Str "more"]] + ,[Para [Str "2.0"]] + ,[Para [Str "more"]]]] +,Table [] [AlignDefault,AlignDefault] [0.0,0.0] + [[] + ,[]] + [[[Para [Str "Orange"]] + ,[Para [Str "Apple"]]] + ,[[Para [Str "Bread"]] + ,[Table [] [AlignDefault,AlignDefault] [0.0,0.0] + [[Para [Str "fruit"]] + ,[Para [Str "topping"]]] + [[[Para [Str "apple"]] + ,[Para [Str "ice",Space,Str "cream"]]]]]] + ,[[Para [Str "Butter"]] + ,[Para [Str "Ice",Space,Str "cream"]]]] +,Header 2 [Str "notes"] +,Para [Str "My",Space,Str "note!",Note [Plain [Str "This."]]]] diff --git a/tests/mediawiki-reader.wiki b/tests/mediawiki-reader.wiki new file mode 100644 index 000000000..a9769594d --- /dev/null +++ b/tests/mediawiki-reader.wiki @@ -0,0 +1,369 @@ += header = + +== header level two == + +===header level 3=== + +====header ''level'' four==== + +===== header level 5 ===== + +====== header level 6 ====== + +======= not a header ======== + + == not a header == + +== emph and strong == + +''emph'' '''strong''' + +'''''strong and emph''''' + +'''''emph inside'' strong''' + +'''strong with ''emph''''' + +'''''strong inside''' emph'' + +== horizontal rule == + +top +---- +bottom + +---- + +== nowiki == + +<nowiki>''not emph''</nowiki> + +== strikeout == + +<strike> This is ''struck out''</strike> + +== entities == + +hi & low + +hi & low + +Gödel + +̉પ + +== comments == + +inline<!-- secret --> comment + +<!-- secret --> + +between blocks + + <!-- secret --> + +== linebreaks == + +hi<br/>there + +hi<br> +there + +== : indents == + +hi +: there +bud + +hi +:: there +bud + +== p tags == + +hi there +<p> +bud +<p> +another +</p> + +== raw html == + +hi <span style="color:red">''there''</span>. + +<ins>inserted</ins> + +<div class="special"> +hi ''there'' +</div> + +== sup, sub, del == + +H<sub>2</sub>O base<sup>''exponent''</sup> +<del>hello</del> + +== inline code == + +<code>*→*</code> <tt>typed</tt> <hask>>>=</hask> + +== code blocks == + +<pre> +case xs of + (_:_) -> reverse xs + [] -> ['*'] +</pre> + +<haskell> +case xs of + (_:_) -> reverse xs + [] -> ['*'] +</haskell> + +<syntaxhighlight lang="ruby" line start=100> +widgets.each do |w| + print w.price +end +</syntaxhighlight> + +== block quotes == + +Regular paragraph +<blockquote> +This is a block quote. + +With two paragraphs. +</blockquote> +Nother paragraph. + +== external links == + +[http://google.com ''Google'' search engine] + +http://johnmacfarlane.net/pandoc/ + +[http://google.com] [http://yahoo.com] + +[mailto:info@example.org email me] + +== internal links == + +[[Help]] + +[[Help|the help page]] + +[[Help]]ers + +[[Help]]<nowiki/>ers + +[[Help:Contents|]] + +[[#My anchor]] + +[[Page#with anchor|and text]] + +== images == + +[[File:example.jpg|caption]] + +[[File:example.jpg|border|the ''caption'' with [http://google.com external link]]] + +[[File:example.jpg|frameless|border|30x40px|caption]] + +[[File:example.jpg]] + +== lists == + +* Start each line +* with an asterisk (*). +** More asterisks gives deeper +*** and deeper levels. +* Line breaks<br/>don't break levels. +*** But jumping levels creates empty space. +Any other start ends the list. + +# Start each line +# with a number sign (#). +## More number signs gives deeper +### and deeper +### levels. +# Line breaks<br/>don't break levels. +### But jumping levels creates empty space. +# Blank lines + +# end the list and start another. +Any other start also +ends the list. + +;item 1 +: definition 1 +;item 2 +: definition 2-1 +: definition 2-2 + +# one +# two +#* two point one +#* two point two +# three +#; three item one +#: three def one +# four +#: four def one +#: this looks like a continuation +#: and is often used +#: instead<br/>of <nowiki><br/></nowiki> +# {{{template +|author=John +|title=My Book +}}} +## five sub 1 +### five sub 1 sub 1 +## five sub 2 + +<ol> + <li>list item ''emph'' + <ol> + <li>list item B1</li> + <li>list item B2</li> + </ol>continuing list item A1 + </li> + <li>list item A2</li> +</ol> + +<ul> +#abc +#def +#ghi +</ul> + +<ol start="9"> +<li>Amsterdam</li> +<li>Rotterdam</li> +<li>The Hague</li> +</ol> + +== math == + +Here is some <math>x=\frac{y^\pi}{z}</math>. + +== preformatted blocks == + + Start each line with a space. + Text is '''preformatted''' and + ''markups'' '''''can''''' be done. + + hell yeah + + <nowiki>Start with a space in the first column, +(before the <nowiki>). + +Then your block format will be + maintained. + +This is good for copying in code blocks: + +def function(): + """documentation string""" + + if True: + print True + else: + print False</nowiki> + +Not<hr/> preformatted + +== templates == + +{{Welcome}} + +{{Foo:Bar}} + +{{Thankyou|all your effort|Me}} + +Written {{{date}}} by {{{name}}}. + +== tables == + +{| +|- +|Orange +|Apple +|- +|Bread +|Pie +|- +|Butter +|Ice cream +|} + +{| +|+Food complements +!Orange +!Apple +|- +|Bread +|Pie +|- +!Butter +|Ice cream +|} + +{| +|+Food complements +!Orange +!Apple +|- +|Bread + +and cheese +|Pie + +# apple +# carrot + +|} + +{| +| Orange || Apple || more +|- +| Bread || Pie || more +|- +| Butter || Ice cream || and more +|} + +{|width="50%" +! align="left" width="50%"| Left +! align="right"|Right +! align="center"|Center +|- +| left || 15.00 || centered +|- +| more || 2.0 || more +|} + +{| +|- +|Orange +|Apple +|- +|Bread +| +{| +!fruit +!topping +|- +|apple +|ice cream +|} +|- +|Butter +|Ice cream +|} + + +== notes == + +My note!<ref>This.</ref> + diff --git a/tests/tables.latex b/tests/tables.latex index 56b469a54..2a8013413 100644 --- a/tests/tables.latex +++ b/tests/tables.latex @@ -1,64 +1,59 @@ Simple table with caption: -\ctable[caption = {Demonstration of simple table syntax.}, -pos = H, center, botcap]{rlcl} -{% notes -} -{% rows -\FL +\begin{longtable}[c]{rlcl} +\hline\noalign{\medskip} Right & Left & Center & Default -\ML +\\\noalign{\medskip} +\hline\noalign{\medskip} 12 & 12 & 12 & 12 \\\noalign{\medskip} 123 & 123 & 123 & 123 \\\noalign{\medskip} 1 & 1 & 1 & 1 -\LL -} +\\\noalign{\medskip} +\hline +\noalign{\medskip} +\caption{Demonstration of simple table syntax.} +\end{longtable} Simple table without caption: -\ctable[pos = H, center, botcap]{rlcl} -{% notes -} -{% rows -\FL +\begin{longtable}[c]{rlcl} +\hline\noalign{\medskip} Right & Left & Center & Default -\ML +\\\noalign{\medskip} +\hline\noalign{\medskip} 12 & 12 & 12 & 12 \\\noalign{\medskip} 123 & 123 & 123 & 123 \\\noalign{\medskip} 1 & 1 & 1 & 1 -\LL -} +\\\noalign{\medskip} +\hline +\end{longtable} Simple table indented two spaces: -\ctable[caption = {Demonstration of simple table syntax.}, -pos = H, center, botcap]{rlcl} -{% notes -} -{% rows -\FL +\begin{longtable}[c]{rlcl} +\hline\noalign{\medskip} Right & Left & Center & Default -\ML +\\\noalign{\medskip} +\hline\noalign{\medskip} 12 & 12 & 12 & 12 \\\noalign{\medskip} 123 & 123 & 123 & 123 \\\noalign{\medskip} 1 & 1 & 1 & 1 -\LL -} +\\\noalign{\medskip} +\hline +\noalign{\medskip} +\caption{Demonstration of simple table syntax.} +\end{longtable} Multiline table with caption: -\ctable[caption = {Here's the caption. It may span multiple lines.}, -pos = H, center, botcap]{clrl} -{% notes -} -{% rows -\FL +\begin{longtable}[c]{clrl} +\hline\noalign{\medskip} \parbox[b]{0.15\columnwidth}{\centering Centered Header } & \parbox[b]{0.14\columnwidth}{\raggedright @@ -68,7 +63,8 @@ Right Aligned } & \parbox[b]{0.34\columnwidth}{\raggedright Default aligned } -\ML +\\\noalign{\medskip} +\hline\noalign{\medskip} \parbox[t]{0.15\columnwidth}{\centering First } & \parbox[t]{0.14\columnwidth}{\raggedright @@ -88,16 +84,16 @@ row } & \parbox[t]{0.34\columnwidth}{\raggedright Here's another one. Note the blank line between rows. } -\LL -} +\\\noalign{\medskip} +\hline +\noalign{\medskip} +\caption{Here's the caption. It may span multiple lines.} +\end{longtable} Multiline table without caption: -\ctable[pos = H, center, botcap]{clrl} -{% notes -} -{% rows -\FL +\begin{longtable}[c]{clrl} +\hline\noalign{\medskip} \parbox[b]{0.15\columnwidth}{\centering Centered Header } & \parbox[b]{0.14\columnwidth}{\raggedright @@ -107,7 +103,8 @@ Right Aligned } & \parbox[b]{0.34\columnwidth}{\raggedright Default aligned } -\ML +\\\noalign{\medskip} +\hline\noalign{\medskip} \parbox[t]{0.15\columnwidth}{\centering First } & \parbox[t]{0.14\columnwidth}{\raggedright @@ -127,31 +124,27 @@ row } & \parbox[t]{0.34\columnwidth}{\raggedright Here's another one. Note the blank line between rows. } -\LL -} +\\\noalign{\medskip} +\hline +\end{longtable} Table without column headers: -\ctable[pos = H, center, botcap]{rlcr} -{% notes -} -{% rows -\FL +\begin{longtable}[c]{rlcr} +\hline\noalign{\medskip} 12 & 12 & 12 & 12 \\\noalign{\medskip} 123 & 123 & 123 & 123 \\\noalign{\medskip} 1 & 1 & 1 & 1 -\LL -} +\\\noalign{\medskip} +\hline +\end{longtable} Multiline table without column headers: -\ctable[pos = H, center, botcap]{clrl} -{% notes -} -{% rows -\FL +\begin{longtable}[c]{clrl} +\hline\noalign{\medskip} \parbox[t]{0.15\columnwidth}{\centering First } & \parbox[t]{0.14\columnwidth}{\raggedright @@ -171,5 +164,6 @@ row } & \parbox[t]{0.34\columnwidth}{\raggedright Here's another one. Note the blank line between rows. } -\LL -} +\\\noalign{\medskip} +\hline +\end{longtable} diff --git a/tests/textile-reader.native b/tests/textile-reader.native index 7532a8fda..84dc50516 100644 --- a/tests/textile-reader.native +++ b/tests/textile-reader.native @@ -155,4 +155,4 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) ,Para [Str "\174",Space,Str "Hi",Str "\174"] ,Para [Str "Hi",Str "\169",Str "2008",Space,Str "\169",Space,Str "2008"] ,Header 1 [Str "Footnotes"] -,Para [Str "A",Space,Str "note",Str ".",Note [Para [Str "The",Space,Str "note",LineBreak,Str "is",Space,Str "here",Str "!",Space,Str "Another",Space,Str "note",Note [Para [Str "Other",Space,Str "note."]],Str "."]]]] +,Para [Str "A",Space,Str "note",Str ".",Note [Para [Str "The",Space,Str "note",LineBreak,Str "is",Space,Str "here",Str "!"]],Space,Str "Another",Space,Str "note",Note [Para [Str "Other",Space,Str "note",Str "."]],Str "."]] diff --git a/tests/writer.context b/tests/writer.context index bb070ce67..ff82aa457 100644 --- a/tests/writer.context +++ b/tests/writer.context @@ -6,7 +6,7 @@ % Enable hyperlinks \setupinteraction[state=start, color=middleblue] -\setuppapersize [letter][letter] +\setuppapersize [letter][letter] \setuplayout [width=middle, backspace=1.5in, cutspace=1.5in, height=middle, topspace=0.75in, bottomspace=0.75in] diff --git a/tests/writer.html b/tests/writer.html index c9ef6f1f1..67bb57ead 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -281,29 +281,34 @@ These should not be escaped: \$ \\ \> \[ \{</code></pre> <dl> <dt>apple</dt> <dd>red fruit -</dd><dd>computer +</dd> +<dd>computer </dd> <dt>orange</dt> <dd>orange fruit -</dd><dd>bank +</dd> +<dd>bank </dd> </dl> <p>Multiple definitions, loose:</p> <dl> <dt>apple</dt> <dd><p>red fruit</p> -</dd><dd><p>computer</p> +</dd> +<dd><p>computer</p> </dd> <dt>orange</dt> <dd><p>orange fruit</p> -</dd><dd><p>bank</p> +</dd> +<dd><p>bank</p> </dd> </dl> <p>Blank line after term, indented marker, alternate markers:</p> <dl> <dt>apple</dt> <dd><p>red fruit</p> -</dd><dd><p>computer</p> +</dd> +<dd><p>computer</p> </dd> <dt>orange</dt> <dd><p>orange fruit</p> diff --git a/tests/writer.latex b/tests/writer.latex index 3efc08277..bab23cd64 100644 --- a/tests/writer.latex +++ b/tests/writer.latex @@ -786,7 +786,7 @@ Just a \href{/url/}{URL}. \href{/url/}{URL and title} -\href{/url/with\_underscore}{with\_underscore} +\href{/url/with_underscore}{with\_underscore} \href{mailto:nobody@nowhere.net}{Email link} |