diff options
Diffstat (limited to 'test/command')
189 files changed, 5146 insertions, 1321 deletions
diff --git a/test/command/1390.md b/test/command/1390.md index ffd2cef8d..1d479dc94 100644 --- a/test/command/1390.md +++ b/test/command/1390.md @@ -3,7 +3,9 @@ \newcommand\foo{+} Testing: $\mu\foo\eta$. ^D -[Para [Str "Testing:",Space,Math InlineMath "\\mu+\\eta",Str "."]] +[ Para + [ Str "Testing:", Space, Math InlineMath "\\mu+\\eta", Str "." ] +] ``` <!-- It would be nice to handle this case, but I don't diff --git a/test/command/1592.md b/test/command/1592.md index fb66f738a..8df5907d4 100644 --- a/test/command/1592.md +++ b/test/command/1592.md @@ -2,35 +2,35 @@ % pandoc -t native [hi]{.smallcaps} ^D -[Para [SmallCaps [Str "hi"]]] +[ Para [ SmallCaps [ Str "hi" ] ] ] ``` ``` % pandoc -t native [hi]{style="font-variant: small-caps;"} ^D -[Para [SmallCaps [Str "hi"]]] +[ Para [ SmallCaps [ Str "hi" ] ] ] ``` ``` % pandoc -t native <span class="smallcaps">hi</span> ^D -[Para [SmallCaps [Str "hi"]]] +[ Para [ SmallCaps [ Str "hi" ] ] ] ``` ``` % pandoc -f html -t native <p><span class="smallcaps">hi</span></p> ^D -[Para [SmallCaps [Str "hi"]]] +[ Para [ SmallCaps [ Str "hi" ] ] ] ``` ``` % pandoc -f html -t native <p><span style="font-variant:small-caps">hi</span></p> ^D -[Para [SmallCaps [Str "hi"]]] +[ Para [ SmallCaps [ Str "hi" ] ] ] ``` ``` @@ -51,14 +51,24 @@ % pandoc -f html -t native <bdo dir="ltr">foo</bdo> ^D -[Plain [Span ("",[],[("dir","ltr")]) [Str "foo"]]] +[ Plain [ Span ( "", [], [ ( "dir", "ltr" ) ] ) [ Str "foo" ] ] ] ``` ``` % pandoc -f html -t native <bdo dir="rtl">foo<bdo dir="ltr">bar</bdo>baz</bdo> ^D -[Plain [Span ("",[],[("dir","rtl")]) [Str "foo",Span ("",[],[("dir","ltr")]) [Str "bar"],Str "baz"]]] +[ Plain + [ Span + ( "", [], [ ( "dir", "rtl" ) ] ) + [ Str "foo" + , Span + ( "", [], [ ( "dir", "ltr" ) ] ) + [ Str "bar" ] + , Str "baz" + ] + ] +] ``` ``` @@ -66,5 +76,23 @@ <p><bdo dir="rtl">This text will go right to left.</bdo></p> ^D -[Para [Span ("",[],[("dir","rtl")]) [Str "This",Space,Str "text",Space,Str "will",Space,Str "go",Space,Str "right",SoftBreak,Str "to",Space,Str "left."]]] +[ Para + [ Span + ( "", [], [ ( "dir", "rtl" ) ] ) + [ Str "This" + , Space + , Str "text" + , Space + , Str "will" + , Space + , Str "go" + , Space + , Str "right" + , SoftBreak + , Str "to" + , Space + , Str "left." + ] + ] +] ``` diff --git a/test/command/1608.md b/test/command/1608.md index f7ef2b839..bc77117ac 100644 --- a/test/command/1608.md +++ b/test/command/1608.md @@ -28,14 +28,183 @@ Triangles with sides of length \(a=p^2-q^2\), \(b=2pq\) and \(c=p^2+q^2\) are ri These are all pretty interesting facts. \end{remark} ^D -[Div ("def:tri",["definition"],[]) - [Para [Strong [Str "Definition",Space,Str "1"],Space,Str "(right-angled",Space,Str "triangles).",Space,Space,Str "A",Space,Emph [Str "right-angled",Space,Str "triangle"],Space,Str "is",Space,Str "a",Space,Str "triangle",Space,Str "whose",Space,Str "sides",Space,Str "of",Space,Str "length\160",Math InlineMath "a",Str ",",Space,Math InlineMath "b",Space,Str "and\160",Math InlineMath "c",Str ",",Space,Str "in",Space,Str "some",Space,Str "permutation",Space,Str "of",Space,Str "order,",Space,Str "satisfies",Space,Math InlineMath "a^2+b^2=c^2",Str "."]] -,Div ("",["lemma"],[]) - [Para [Strong [Str "Lemma",Space,Str "2"],Str ".",Space,Space,Emph [Str "The",Space,Str "triangle",Space,Str "with",Space,Str "sides",Space,Str "of",Space,Str "length\160",Math InlineMath "3",Str ",",Space,Math InlineMath "4",Space,Str "and\160",Math InlineMath "5",Space,Str "is",Space,Str "right-angled."]]] -,Div ("",["proof"],[]) - [Para [Emph [Str "Proof."],Space,Str "This",Space,Str "lemma",Space,Str "follows",Space,Str "from",Space,Link ("",[],[("reference-type","ref"),("reference","def:tri")]) [Str "Definition\160\&1"] ("#def:tri",""),Space,Str "since",Space,Math InlineMath "3^2+4^2=9+16=25=5^2",Str ".",Str "\160\9723"]] -,Div ("thm:py",["theorem"],[]) - [Para [Strong [Str "Theorem",Space,Str "3"],Space,Str "(Pythagorean",Space,Str "triplets).",Space,Space,Emph [Str "Triangles",Space,Str "with",Space,Str "sides",Space,Str "of",Space,Str "length",Space,Math InlineMath "a=p^2-q^2",Str ",",Space,Math InlineMath "b=2pq",Space,Str "and",Space,Math InlineMath "c=p^2+q^2",Space,Str "are",Space,Str "right-angled",Space,Str "triangles."]]] -,Div ("",["remark"],[]) - [Para [Emph [Str "Remark",Space,Str "1"],Str ".",Space,Space,Str "These",Space,Str "are",Space,Str "all",Space,Str "pretty",Space,Str "interesting",Space,Str "facts."]]] +[ Div + ( "def:tri", [ "definition" ], [] ) + [ Para + [ Strong + [ Str "Definition", Space, Str "1" ] + , Space + , Str "(right-angled" + , Space + , Str "triangles)." + , Space + , Space + , Str "A" + , Space + , Emph + [ Str "right-angled", Space, Str "triangle" ] + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "triangle" + , Space + , Str "whose" + , Space + , Str "sides" + , Space + , Str "of" + , Space + , Str "length\160" + , Math InlineMath "a" + , Str "," + , Space + , Math InlineMath "b" + , Space + , Str "and\160" + , Math InlineMath "c" + , Str "," + , Space + , Str "in" + , Space + , Str "some" + , Space + , Str "permutation" + , Space + , Str "of" + , Space + , Str "order," + , Space + , Str "satisfies" + , Space + , Math InlineMath "a^2+b^2=c^2" + , Str "." + ] + ] +, Div + ( "", [ "lemma" ], [] ) + [ Para + [ Strong + [ Str "Lemma", Space, Str "2" ] + , Str "." + , Space + , Space + , Emph + [ Str "The" + , Space + , Str "triangle" + , Space + , Str "with" + , Space + , Str "sides" + , Space + , Str "of" + , Space + , Str "length\160" + , Math InlineMath "3" + , Str "," + , Space + , Math InlineMath "4" + , Space + , Str "and\160" + , Math InlineMath "5" + , Space + , Str "is" + , Space + , Str "right-angled." + ] + ] + ] +, Div + ( "", [ "proof" ], [] ) + [ Para + [ Emph + [ Str "Proof." ] + , Space + , Str "This" + , Space + , Str "lemma" + , Space + , Str "follows" + , Space + , Str "from" + , Space + , Link + ( "" + , [] + , + [ ( "reference-type", "ref" ), ( "reference", "def:tri" ) ] + ) + [ Str "Definition\160\&1" ] + ( "#def:tri", "" ) + , Space + , Str "since" + , Space + , Math InlineMath "3^2+4^2=9+16=25=5^2" + , Str "." + , Str "\160\9723" + ] + ] +, Div + ( "thm:py", [ "theorem" ], [] ) + [ Para + [ Strong + [ Str "Theorem", Space, Str "3" ] + , Space + , Str "(Pythagorean" + , Space + , Str "triplets)." + , Space + , Space + , Emph + [ Str "Triangles" + , Space + , Str "with" + , Space + , Str "sides" + , Space + , Str "of" + , Space + , Str "length" + , Space + , Math InlineMath "a=p^2-q^2" + , Str "," + , Space + , Math InlineMath "b=2pq" + , Space + , Str "and" + , Space + , Math InlineMath "c=p^2+q^2" + , Space + , Str "are" + , Space + , Str "right-angled" + , Space + , Str "triangles." + ] + ] + ] +, Div + ( "", [ "remark" ], [] ) + [ Para + [ Emph + [ Str "Remark", Space, Str "1" ] + , Str "." + , Space + , Space + , Str "These" + , Space + , Str "are" + , Space + , Str "all" + , Space + , Str "pretty" + , Space + , Str "interesting" + , Space + , Str "facts." + ] + ] +] ``` diff --git a/test/command/168.md b/test/command/168.md index 43c3b865a..02b426089 100644 --- a/test/command/168.md +++ b/test/command/168.md @@ -11,13 +11,25 @@ nested div ::: ::::::::::::::::::::::::::::::: ^D -[Div ("",["warning"],[]) - [Para [Str "This",Space,Str "is",Space,Str "the",Space,Str "warning!"] - ,OrderedList (1,Decimal,Period) - [[Plain [Str "list"]] - ,[Plain [Str "another"]]] - ,Div ("myid",["class"],[("key","val")]) - [Para [Str "nested",Space,Str "div"]]]] +[ Div + ( "", [ "warning" ], [] ) + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "warning!" + ] + , OrderedList + ( 1, Decimal, Period ) + [ [ Plain [ Str "list" ] ], [ Plain [ Str "another" ] ] ] + , Div + ( "myid", [ "class" ], [ ( "key", "val" ) ] ) + [ Para [ Str "nested", Space, Str "div" ] ] + ] +] ``` ``` @@ -26,7 +38,7 @@ foo ::: bar ^D -[Para [Str "foo",SoftBreak,Str ":::",SoftBreak,Str "bar"]] +[ Para [ Str "foo", SoftBreak, Str ":::", SoftBreak, Str "bar" ] ] ``` ``` @@ -37,7 +49,19 @@ Here is a paragraph. And another. ::::: ^D -[Div ("",["Warning"],[]) - [Para [Str "Here",Space,Str "is",Space,Str "a",Space,Str "paragraph."] - ,Para [Str "And",Space,Str "another."]]] +[ Div + ( "", [ "Warning" ], [] ) + [ Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "paragraph." + ] + , Para + [ Str "And", Space, Str "another." ] + ] +] ``` diff --git a/test/command/1718.md b/test/command/1718.md index 7e07bf1e9..132c5ba6a 100644 --- a/test/command/1718.md +++ b/test/command/1718.md @@ -7,5 +7,11 @@ Note[^1]. [^2]: the second, unused, note. ^D [WARNING] Note with key '2' defined at line 5 column 1 but not used. -[Para [Str "Note",Note [Para [Str "the",Space,Str "first",Space,Str "note."]],Str "."]] +[ Para + [ Str "Note" + , Note + [ Para [ Str "the", Space, Str "first", Space, Str "note." ] ] + , Str "." + ] +] ``` diff --git a/test/command/1773.md b/test/command/1773.md index b93267287..ee52ac867 100644 --- a/test/command/1773.md +++ b/test/command/1773.md @@ -2,5 +2,5 @@ % pandoc -f latex+raw_tex -t native \noindent hi ^D -[Para [RawInline (Format "latex") "\\noindent ",Str "hi"]] +[ Para [ RawInline ( Format "latex" ) "\\noindent ", Str "hi" ] ] ``` diff --git a/test/command/1881.md b/test/command/1881.md index f91c50d68..92d0317ba 100644 --- a/test/command/1881.md +++ b/test/command/1881.md @@ -20,35 +20,88 @@ </tbody> </table> ^D -[Table ("",[],[]) (Caption Nothing - [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) - [(AlignRight,ColWidthDefault) - ,(AlignLeft,ColWidthDefault) - ,(AlignCenter,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",["header"],[]) - [Cell ("",[],[]) AlignRight (RowSpan 1) (ColSpan 1) - [Plain [Str "Right"]] - ,Cell ("",[],[]) AlignLeft (RowSpan 1) (ColSpan 1) - [Plain [Str "Left"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Plain [Str "Center"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Default"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",["odd"],[]) - [Cell ("",[],[]) AlignRight (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignLeft (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing + [ Plain + [ Str "Demonstration" + , Space + , Str "of" + , Space + , Str "simple" + , Space + , Str "table" + , Space + , Str "syntax." + ] + ] + ) + [ + ( AlignRight, ColWidthDefault ) + , + ( AlignLeft, ColWidthDefault ) + , + ( AlignCenter, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [ "header" ], [] ) + [ Cell + ( "", [], [] ) AlignRight + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Right" ] ] + , Cell + ( "", [], [] ) AlignLeft + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Left" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Center" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Default" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [ "odd" ], [] ) + [ Cell + ( "", [], [] ) AlignRight + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "12" ] ] + , Cell + ( "", [], [] ) AlignLeft + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "12" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "12" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "12" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` ``` @@ -62,26 +115,48 @@ </tr> </table> ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignRight,ColWidthDefault) - ,(AlignLeft,ColWidthDefault) - ,(AlignCenter,ColWidthDefault) - ,(AlignRight,ColWidthDefault)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",["odd"],[]) - [Cell ("",[],[]) AlignRight (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignLeft (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]] - ,Cell ("",[],[]) AlignRight (RowSpan 1) (ColSpan 1) - [Plain [Str "12"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignRight, ColWidthDefault ) + , + ( AlignLeft, ColWidthDefault ) + , + ( AlignCenter, ColWidthDefault ) + , + ( AlignRight, ColWidthDefault ) + ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [ "odd" ], [] ) + [ Cell + ( "", [], [] ) AlignRight + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "12" ] ] + , Cell + ( "", [], [] ) AlignLeft + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "12" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "12" ] ] + , Cell + ( "", [], [] ) AlignRight + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "12" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/2118.md b/test/command/2118.md index b38f48c80..54eaa2653 100644 --- a/test/command/2118.md +++ b/test/command/2118.md @@ -7,5 +7,11 @@ \label{fig:setminus} \end{figure} ^D -[Para [Image ("fig:setminus",[],[("width","80%")]) [Str "Set",Space,Str "subtraction"] ("setminus.png","fig:")]] +[ Para + [ Image + ( "fig:setminus", [], [ ( "width", "80%" ) ] ) + [ Str "Set", Space, Str "subtraction" ] + ( "setminus.png", "fig:" ) + ] +] ``` diff --git a/test/command/2549.md b/test/command/2549.md index 8f4aea852..4f2e4ff88 100644 --- a/test/command/2549.md +++ b/test/command/2549.md @@ -4,7 +4,7 @@ \section{A section}\label{foo} } ^D -[Header 1 ("foo",[],[]) [Str "A",Space,Str "section"]] +[ Header 1 ( "foo", [], [] ) [ Str "A", Space, Str "section" ] ] ``` ``` @@ -13,15 +13,17 @@ \section{A section}\label{foo} } ^D -[Div ("bar",[],[]) - [Header 1 ("foo",[],[]) [Str "A",Space,Str "section"]]] +[ Div + ( "bar", [], [] ) + [ Header 1 ( "foo", [], [] ) [ Str "A", Space, Str "section" ] ] +] ``` ``` % pandoc -f latex -t native Bar \hypertarget{foo}{Foo} ^D -[Para [Str "Bar",Space,Span ("foo",[],[]) [Str "Foo"]]] +[ Para [ Str "Bar", Space, Span ( "foo", [], [] ) [ Str "Foo" ] ] ] ``` ``` @@ -32,7 +34,6 @@ bar \end{verbatim} } ^D -[Div ("foo",[],[]) - [CodeBlock ("",[],[]) "bar"]] +[ Div ( "foo", [], [] ) [ CodeBlock ( "", [], [] ) "bar" ] ] ``` diff --git a/test/command/256.md b/test/command/256.md index 08e483e5c..81c3dc95b 100644 --- a/test/command/256.md +++ b/test/command/256.md @@ -2,11 +2,41 @@ % pandoc --abbreviations=command/abbrevs -t native Foo. bar baz h.k. and e.g. and Mr. Brown. ^D -[Para [Str "Foo.\160bar",Space,Str "baz",Space,Str "h.k.\160and",Space,Str "e.g.",Space,Str "and",Space,Str "Mr.",Space,Str "Brown."]] +[ Para + [ Str "Foo.\160bar" + , Space + , Str "baz" + , Space + , Str "h.k.\160and" + , Space + , Str "e.g." + , Space + , Str "and" + , Space + , Str "Mr." + , Space + , Str "Brown." + ] +] ``` ``` % pandoc -t native Foo. bar baz h.k. and e.g. and Mr. Brown. ^D -[Para [Str "Foo.",Space,Str "bar",Space,Str "baz",Space,Str "h.k.",Space,Str "and",Space,Str "e.g.\160and",Space,Str "Mr.\160Brown."]] +[ Para + [ Str "Foo." + , Space + , Str "bar" + , Space + , Str "baz" + , Space + , Str "h.k." + , Space + , Str "and" + , Space + , Str "e.g.\160and" + , Space + , Str "Mr.\160Brown." + ] +] ``` diff --git a/test/command/3113.md b/test/command/3113.md index 5ca171d97..034f1542b 100644 --- a/test/command/3113.md +++ b/test/command/3113.md @@ -8,6 +8,8 @@ C&=&D,\\ E&=&F \end{eqnarray} ^D -[Para [Math DisplayMath "\\begin{aligned}\nA&=&B,\\\\\nC&=&D,\\\\\n%\\end{eqnarray}\n%\\begin{eqnarray}\nE&=&F\\end{aligned}"]] +[ Para + [ Math DisplayMath "\\begin{aligned}\nA&=&B,\\\\\nC&=&D,\\\\\n%\\end{eqnarray}\n%\\begin{eqnarray}\nE&=&F\\end{aligned}" ] +] ``` diff --git a/test/command/3123.md b/test/command/3123.md index b71241cdf..a420d27c5 100644 --- a/test/command/3123.md +++ b/test/command/3123.md @@ -2,12 +2,14 @@ % pandoc -f markdown -t native <?php echo "1" ; ?> ^D -[RawBlock (Format "html") "<?php echo \"1\" ; ?>"] +[ RawBlock ( Format "html" ) "<?php echo \"1\" ; ?>" ] ``` ``` % pandoc -f markdown -t native a<?php echo "1" ; ?> ^D -[Para [Str "a",RawInline (Format "html") "<?php echo \"1\" ; ?>"]] +[ Para + [ Str "a", RawInline ( Format "html" ) "<?php echo \"1\" ; ?>" ] +] ``` diff --git a/test/command/3236.md b/test/command/3236.md index 2fcbb11f1..856e5f78c 100644 --- a/test/command/3236.md +++ b/test/command/3236.md @@ -5,5 +5,17 @@ \includegraphics[width=17cm]{\mycolor /header} Magnificent \mycolor{} header. ^D -[Para [Image ("",[],[("width","17cm")]) [Str "image"] ("red/header",""),SoftBreak,Str "Magnificent",Space,Str "red",Space,Str "header."]] +[ Para + [ Image + ( "", [], [ ( "width", "17cm" ) ] ) + [ Str "image" ] + ( "red/header", "" ) + , SoftBreak + , Str "Magnificent" + , Space + , Str "red" + , Space + , Str "header." + ] +] ``` diff --git a/test/command/3257.md b/test/command/3257.md index 31d9426ee..5faabadf8 100644 --- a/test/command/3257.md +++ b/test/command/3257.md @@ -2,12 +2,12 @@ % pandoc -t native (i<j) ^D -[Para [Str "(i<j)"]] +[ Para [ Str "(i<j)" ] ] ``` ``` % pandoc -t native i<j-1, j>k ^D -[Para [Str "i<j-1,",Space,Str "j>k"]] +[ Para [ Str "i<j-1,", Space, Str "j>k" ] ] ``` diff --git a/test/command/3348.md b/test/command/3348.md index 86b1514d1..6f9e18bed 100644 --- a/test/command/3348.md +++ b/test/command/3348.md @@ -7,24 +7,61 @@ line of text ----- ------------------------------------------------ ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignRight,ColWidth 8.333333333333333e-2) - ,(AlignLeft,ColWidth 0.6805555555555556)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "foo"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "bar"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "foo"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "long",SoftBreak,Str "line",Space,Str "of",Space,Str "text"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignRight, ColWidth 8.333333333333333 e- 2 ) + , + ( AlignLeft, ColWidth 0.6805555555555556 ) + ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "foo" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "bar" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "foo" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain + [ Str "this" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "long" + , SoftBreak + , Str "line" + , Space + , Str "of" + , Space + , Str "text" + ] + ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/3401.md b/test/command/3401.md index 99528553a..0f1e5f18f 100644 --- a/test/command/3401.md +++ b/test/command/3401.md @@ -5,7 +5,7 @@ See #3401 and <http://orgmode.org/manual/Macro-replacement.html> #+MACRO: HELLO /Hello, $1/ {{{HELLO(World)}}} ^D -[Para [Emph [Str "Hello,",Space,Str "World"]]] +[ Para [ Emph [ Str "Hello,", Space, Str "World" ] ] ] ``` Inverted argument order @@ -15,5 +15,5 @@ Inverted argument order #+MACRO: A $2,$1 {{{A(1,2)}}} ^D -[Para [Str "2,1"]] +[ Para [ Str "2,1" ] ] ``` diff --git a/test/command/3407.md b/test/command/3407.md index aec253ff5..551cefd1d 100644 --- a/test/command/3407.md +++ b/test/command/3407.md @@ -9,5 +9,7 @@ % pandoc -f rst -t native :foo:`text` ^D -[Para [Code ("",["interpreted-text"],[("role","foo")]) "text"]] +[ Para + [ Code ( "", [ "interpreted-text" ], [ ( "role", "foo" ) ] ) "text" ] +] ``` diff --git a/test/command/3510.md b/test/command/3510.md index 7993db848..ce4d59e79 100644 --- a/test/command/3510.md +++ b/test/command/3510.md @@ -10,11 +10,20 @@ Text More text ^D -[Para [Str "Text"] -,Header 1 ("subsection",[],[]) [Str "Subsection"] -,Para [Str "Included",Space,Str "text"] -,Plain [Str "Lorem",Space,Str "ipsum."] -,CodeBlock ("",["haskell"],[]) "putStrLn outString\n" -,RawBlock (Format "latex") "\\emph{Hello}" -,Para [Str "More",Space,Str "text"]] +[ Para + [ Str "Text" ] +, Header 1 + ( "subsection", [], [] ) + [ Str "Subsection" ] +, Para + [ Str "Included", Space, Str "text" ] +, Plain + [ Str "Lorem", Space, Str "ipsum." ] +, CodeBlock + ( "", [ "haskell" ], [] ) "putStrLn outString\n" +, RawBlock + ( Format "latex" ) "\\emph{Hello}" +, Para + [ Str "More", Space, Str "text" ] +] ``` diff --git a/test/command/3511.md b/test/command/3511.md index b8bcedbb0..18a5f1641 100644 --- a/test/command/3511.md +++ b/test/command/3511.md @@ -10,16 +10,22 @@ not continuation ^D -[BulletList - [[Plain [Str "a"] - ,BulletList - [[Plain [Str "b"] - ,BulletList - [[Plain [Str "c"]]]]]] - ,[CodeBlock ("",[],[]) "code"]] -,OrderedList (1000,Decimal,Period) - [[Plain [Str "one"]]] -,CodeBlock ("",[],[]) "not continuation"] +[ BulletList + [ + [ Plain + [ Str "a" ] + , BulletList + [ [ Plain [ Str "b" ], BulletList [ [ Plain [ Str "c" ] ] ] ] ] + ] + , + [ CodeBlock ( "", [], [] ) "code" ] + ] +, OrderedList + ( 1000, Decimal, Period ) + [ [ Plain [ Str "one" ] ] ] +, CodeBlock + ( "", [], [] ) "not continuation" +] ``` ``` @@ -34,13 +40,16 @@ continuation ^D -[BulletList - [[Plain [Str "a"]] - ,[Plain [Str "b"] - ,BulletList - [[Plain [Str "c"]]]] - ,[CodeBlock ("",[],[]) "not code"]] -,OrderedList (1000,Decimal,Period) - [[Para [Str "one"] - ,Para [Str "continuation"]]]] +[ BulletList + [ + [ Plain [ Str "a" ] ] + , + [ Plain [ Str "b" ], BulletList [ [ Plain [ Str "c" ] ] ] ] + , + [ CodeBlock ( "", [], [] ) "not code" ] + ] +, OrderedList + ( 1000, Decimal, Period ) + [ [ Para [ Str "one" ], Para [ Str "continuation" ] ] ] +] ``` diff --git a/test/command/3516.md b/test/command/3516.md index dc8770bad..83e4cee95 100644 --- a/test/command/3516.md +++ b/test/command/3516.md @@ -24,26 +24,46 @@ on Windows builds. | | | +---+---+ ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidth 5.555555555555555e-2) - ,(AlignDefault,ColWidth 5.555555555555555e-2)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - []]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignDefault, ColWidth 5.555555555555555 e- 2 ) + , + ( AlignDefault, ColWidth 5.555555555555555 e- 2 ) + ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "2" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) [] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) [] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` ``` diff --git a/test/command/3530.md b/test/command/3530.md index 178b36ff0..525c691f8 100644 --- a/test/command/3530.md +++ b/test/command/3530.md @@ -3,10 +3,53 @@ \subfile{command/sub-file-chapter-1} \subfile{command/sub-file-chapter-2} ^D -[Header 1 ("chapter-1",[],[]) [Str "Chapter",Space,Str "1"] -,Para [Str "This",Space,Str "is",Space,Str "Chapter",Space,Str "1,",Space,Str "provided",Space,Str "in",Space,Str "a",Space,Str "sub",Space,Str "file."] -,Header 1 ("chapter-2",[],[]) [Str "Chapter",Space,Str "2"] -,Para [Str "This",Space,Str "is",Space,Str "Chapter",Space,Str "2,",Space,Str "provided",Space,Str "in",Space,Str "a",Space,Str "second",Space,Str "sub",Space,Str "file."]] +[ Header 1 + ( "chapter-1", [], [] ) + [ Str "Chapter", Space, Str "1" ] +, Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "Chapter" + , Space + , Str "1," + , Space + , Str "provided" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "sub" + , Space + , Str "file." + ] +, Header 1 + ( "chapter-2", [], [] ) + [ Str "Chapter", Space, Str "2" ] +, Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "Chapter" + , Space + , Str "2," + , Space + , Str "provided" + , Space + , Str "in" + , Space + , Str "a" + , Space + , Str "second" + , Space + , Str "sub" + , Space + , Str "file." + ] +] ``` ``` @@ -14,6 +57,9 @@ \subfile{command/sub-file-chapter-1} \subfile{command/sub-file-chapter-2} ^D -[RawBlock (Format "latex") "\\subfile{command/sub-file-chapter-1}" -,RawBlock (Format "latex") "\\subfile{command/sub-file-chapter-2}"] +[ RawBlock + ( Format "latex" ) "\\subfile{command/sub-file-chapter-1}" +, RawBlock + ( Format "latex" ) "\\subfile{command/sub-file-chapter-2}" +] ``` diff --git a/test/command/3533-rst-csv-tables.md b/test/command/3533-rst-csv-tables.md index 70339d95d..471bd827e 100644 --- a/test/command/3533-rst-csv-tables.md +++ b/test/command/3533-rst-csv-tables.md @@ -5,37 +5,108 @@ :header: Flavor,Price,Slogan :file: command/3533-rst-csv-tables.csv ^D -[Table ("",[],[]) (Caption Nothing - [Plain [Str "Test"]]) - [(AlignDefault,ColWidth 0.4) - ,(AlignDefault,ColWidth 0.2) - ,(AlignDefault,ColWidth 0.4)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Flavor"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Price"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Slogan"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Albatross"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "2.99"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "On",Space,Str "a",Space,Str "stick!"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Crunchy",Space,Str "Frog"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1.49"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "If",Space,Str "we",Space,Str "took",Space,Str "the",Space,Str "bones",Space,Str "out,",Space,Str "it",Space,Str "wouldn't",Space,Str "be",SoftBreak,Str "crunchy,",Space,Str "now",Space,Str "would",Space,Str "it?"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [ Plain [ Str "Test" ] ] ) + [ + ( AlignDefault, ColWidth 0.4 ) + , + ( AlignDefault, ColWidth 0.2 ) + , + ( AlignDefault, ColWidth 0.4 ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Flavor" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Price" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Slogan" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Albatross" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "2.99" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "On", Space, Str "a", Space, Str "stick!" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Crunchy", Space, Str "Frog" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "1.49" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain + [ Str "If" + , Space + , Str "we" + , Space + , Str "took" + , Space + , Str "the" + , Space + , Str "bones" + , Space + , Str "out," + , Space + , Str "it" + , Space + , Str "wouldn't" + , Space + , Str "be" + , SoftBreak + , Str "crunchy," + , Space + , Str "now" + , Space + , Str "would" + , Space + , Str "it?" + ] + ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` ``` @@ -49,37 +120,80 @@ 'cat''s' 3 4 'dog''s' 2 3 ^D -[Table ("",[],[]) (Caption Nothing - [Plain [Str "Test"]]) - [(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "a"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "b"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "cat's"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "3"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "4"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "dog's"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "3"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [ Plain [ Str "Test" ] ] ) + [ + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) [] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "a" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "b" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "cat's" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "3" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "4" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "dog's" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "3" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` ``` @@ -89,20 +203,34 @@ "1","\"" ^D -[Table ("",[],[]) (Caption Nothing - [Plain [Str "Test"]]) - [(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "\""]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [ Plain [ Str "Test" ] ] ) + [ + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "\"" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/3534.md b/test/command/3534.md index cd0915d88..1be10cf62 100644 --- a/test/command/3534.md +++ b/test/command/3534.md @@ -18,7 +18,26 @@ I want to explain the interface of \lstinline{public class MyClass}. % pandoc -f latex -t native I want to explain the interface of \lstinline[language=Java]{public class MyClass}. ^D -[Para [Str "I",Space,Str "want",Space,Str "to",Space,Str "explain",Space,Str "the",Space,Str "interface",Space,Str "of",Space,Code ("",["java"],[]) "public class MyClass",Str "."]] +[ Para + [ Str "I" + , Space + , Str "want" + , Space + , Str "to" + , Space + , Str "explain" + , Space + , Str "the" + , Space + , Str "interface" + , Space + , Str "of" + , Space + , Code + ( "", [ "java" ], [] ) "public class MyClass" + , Str "." + ] +] ``` ``` @@ -41,5 +60,24 @@ I want to explain the interface of \mintinline{java}|public class MyClass|. % pandoc -f latex -t native I want to explain the interface of \mintinline[linenos]{java}{public class MyClass}. ^D -[Para [Str "I",Space,Str "want",Space,Str "to",Space,Str "explain",Space,Str "the",Space,Str "interface",Space,Str "of",Space,Code ("",["java"],[]) "public class MyClass",Str "."]] +[ Para + [ Str "I" + , Space + , Str "want" + , Space + , Str "to" + , Space + , Str "explain" + , Space + , Str "the" + , Space + , Str "interface" + , Space + , Str "of" + , Space + , Code + ( "", [ "java" ], [] ) "public class MyClass" + , Str "." + ] +] ``` diff --git a/test/command/3537.md b/test/command/3537.md index df4eeba7d..934e35836 100644 --- a/test/command/3537.md +++ b/test/command/3537.md @@ -7,14 +7,14 @@ Generalized raw attributes. foo bar ``` ^D -[RawBlock (Format "ms") ".MACRO\nfoo bar"] +[ RawBlock ( Format "ms" ) ".MACRO\nfoo bar" ] ```` ```` % pandoc -t native Hi `there`{=ms}. ^D -[Para [Str "Hi",Space,RawInline (Format "ms") "there",Str "."]] +[ Para [ Str "Hi", Space, RawInline ( Format "ms" ) "there", Str "." ] ] ```` ```` @@ -24,5 +24,5 @@ Hi `there`{=ms}. foo bar ~~~ ^D -[RawBlock (Format "ms") ".MACRO\nfoo bar"] +[ RawBlock ( Format "ms" ) ".MACRO\nfoo bar" ] ```` diff --git a/test/command/3539.md b/test/command/3539.md index 6ef9ffac7..464df7c91 100644 --- a/test/command/3539.md +++ b/test/command/3539.md @@ -4,35 +4,231 @@ % pandoc -f latex -t native Many programming languages provide \glspl{API}. Each \gls{API} should provide a documentation. ^D -[Para [Str "Many",Space,Str "programming",Space,Str "languages",Space,Str "provide",Space,Span ("",[],[("acronym-label","API"),("acronym-form","plural+short")]) [Str "APIs"],Str ".",Space,Str "Each",Space,Span ("",[],[("acronym-label","API"),("acronym-form","singular+short")]) [Str "API"],Space,Str "should",Space,Str "provide",Space,Str "a",Space,Str "documentation."]] +[ Para + [ Str "Many" + , Space + , Str "programming" + , Space + , Str "languages" + , Space + , Str "provide" + , Space + , Span + ( "" + , [] + , + [ ( "acronym-label", "API" ), ( "acronym-form", "plural+short" ) ] + ) + [ Str "APIs" ] + , Str "." + , Space + , Str "Each" + , Space + , Span + ( "" + , [] + , + [ + ( "acronym-label", "API" ) + , + ( "acronym-form", "singular+short" ) + ] + ) + [ Str "API" ] + , Space + , Str "should" + , Space + , Str "provide" + , Space + , Str "a" + , Space + , Str "documentation." + ] +] ``` ``` % pandoc -f latex -t native \Glsdesc{API} XYZ ist not as performant as \glsdesc{API} ZXY. ^D -[Para [Span ("",[],[("acronym-label","API"),("acronym-form","singular+long")]) [Str "API"],Space,Str "XYZ",Space,Str "ist",Space,Str "not",Space,Str "as",Space,Str "performant",Space,Str "as",Space,Span ("",[],[("acronym-label","API"),("acronym-form","singular+long")]) [Str "API"],Space,Str "ZXY."]] +[ Para + [ Span + ( "" + , [] + , + [ + ( "acronym-label", "API" ) + , + ( "acronym-form", "singular+long" ) + ] + ) + [ Str "API" ] + , Space + , Str "XYZ" + , Space + , Str "ist" + , Space + , Str "not" + , Space + , Str "as" + , Space + , Str "performant" + , Space + , Str "as" + , Space + , Span + ( "" + , [] + , + [ + ( "acronym-label", "API" ) + , + ( "acronym-form", "singular+long" ) + ] + ) + [ Str "API" ] + , Space + , Str "ZXY." + ] +] ``` ``` % pandoc -f latex -t native \Acrlong{API} XYZ ist not as performant as \acrlong{API} ZXY. ^D -[Para [Span ("",[],[("acronym-label","API"),("acronym-form","singular+long")]) [Str "API"],Space,Str "XYZ",Space,Str "ist",Space,Str "not",Space,Str "as",Space,Str "performant",Space,Str "as",Space,Span ("",[],[("acronym-label","API"),("acronym-form","singular+long")]) [Str "API"],Space,Str "ZXY."]] +[ Para + [ Span + ( "" + , [] + , + [ + ( "acronym-label", "API" ) + , + ( "acronym-form", "singular+long" ) + ] + ) + [ Str "API" ] + , Space + , Str "XYZ" + , Space + , Str "ist" + , Space + , Str "not" + , Space + , Str "as" + , Space + , Str "performant" + , Space + , Str "as" + , Space + , Span + ( "" + , [] + , + [ + ( "acronym-label", "API" ) + , + ( "acronym-form", "singular+long" ) + ] + ) + [ Str "API" ] + , Space + , Str "ZXY." + ] +] ``` ``` % pandoc -f latex -t native \Acrfull{API} XYZ ist not as performant as \acrfull{API} ZXY. ^D -[Para [Span ("",[],[("acronym-label","API"),("acronym-form","singular+full")]) [Str "API"],Space,Str "XYZ",Space,Str "ist",Space,Str "not",Space,Str "as",Space,Str "performant",Space,Str "as",Space,Span ("",[],[("acronym-label","API"),("acronym-form","singular+full")]) [Str "API"],Space,Str "ZXY."]] +[ Para + [ Span + ( "" + , [] + , + [ + ( "acronym-label", "API" ) + , + ( "acronym-form", "singular+full" ) + ] + ) + [ Str "API" ] + , Space + , Str "XYZ" + , Space + , Str "ist" + , Space + , Str "not" + , Space + , Str "as" + , Space + , Str "performant" + , Space + , Str "as" + , Space + , Span + ( "" + , [] + , + [ + ( "acronym-label", "API" ) + , + ( "acronym-form", "singular+full" ) + ] + ) + [ Str "API" ] + , Space + , Str "ZXY." + ] +] ``` ``` % pandoc -f latex -t native \Acrshort{API} XYZ ist not as performant as \acrshort{API} ZXY. ^D -[Para [Span ("",[],[("acronym-label","API"),("acronym-form","singular+abbrv")]) [Str "API"],Space,Str "XYZ",Space,Str "ist",Space,Str "not",Space,Str "as",Space,Str "performant",Space,Str "as",Space,Span ("",[],[("acronym-label","API"),("acronym-form","singular+abbrv")]) [Str "API"],Space,Str "ZXY."]] +[ Para + [ Span + ( "" + , [] + , + [ + ( "acronym-label", "API" ) + , + ( "acronym-form", "singular+abbrv" ) + ] + ) + [ Str "API" ] + , Space + , Str "XYZ" + , Space + , Str "ist" + , Space + , Str "not" + , Space + , Str "as" + , Space + , Str "performant" + , Space + , Str "as" + , Space + , Span + ( "" + , [] + , + [ + ( "acronym-label", "API" ) + , + ( "acronym-form", "singular+abbrv" ) + ] + ) + [ Str "API" ] + , Space + , Str "ZXY." + ] +] ``` # Commands of [acronym package](ftp://ftp.mpi-sb.mpg.de/pub/tex/mirror/ftp.dante.de/pub/tex/macros/latex/contrib/acronym/acronym.pdf) @@ -41,5 +237,45 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a % pandoc -f latex -t native Many programming languages provide \acp{API}. Each \ac{API} should provide a documentation. ^D -[Para [Str "Many",Space,Str "programming",Space,Str "languages",Space,Str "provide",Space,Span ("",[],[("acronym-label","API"),("acronym-form","plural+short")]) [Str "APIs"],Str ".",Space,Str "Each",Space,Span ("",[],[("acronym-label","API"),("acronym-form","singular+short")]) [Str "API"],Space,Str "should",Space,Str "provide",Space,Str "a",Space,Str "documentation."]] +[ Para + [ Str "Many" + , Space + , Str "programming" + , Space + , Str "languages" + , Space + , Str "provide" + , Space + , Span + ( "" + , [] + , + [ ( "acronym-label", "API" ), ( "acronym-form", "plural+short" ) ] + ) + [ Str "APIs" ] + , Str "." + , Space + , Str "Each" + , Space + , Span + ( "" + , [] + , + [ + ( "acronym-label", "API" ) + , + ( "acronym-form", "singular+short" ) + ] + ) + [ Str "API" ] + , Space + , Str "should" + , Space + , Str "provide" + , Space + , Str "a" + , Space + , Str "documentation." + ] +] ``` diff --git a/test/command/3558.md b/test/command/3558.md index 956b09e57..0da806b1f 100644 --- a/test/command/3558.md +++ b/test/command/3558.md @@ -6,7 +6,11 @@ hello \endmulti ^D -[RawBlock (Format "tex") "\\multi" -,Para [Str "hello"] -,RawBlock (Format "tex") "\\endmulti"] +[ RawBlock + ( Format "tex" ) "\\multi" +, Para + [ Str "hello" ] +, RawBlock + ( Format "tex" ) "\\endmulti" +] ``` diff --git a/test/command/3585.md b/test/command/3585.md index 739ddeea4..2cda46993 100644 --- a/test/command/3585.md +++ b/test/command/3585.md @@ -4,13 +4,35 @@ Same but bzip2 it and nice it <tt>zfs send tank/storage/data/svn@daily-2014-03-20_00.00.00--2w | nice -15 bzip2 | ssh user@hyper.somewhere.org "> /storage/c-3po/tank-storage-data-svn.dmp.bz2"</tt> ^D -[Para [Quoted DoubleQuote [Str "Hello"]] -,Para [Str "Same",Space,Str "but",Space,Str "bzip2",Space,Str "it",Space,Str "and",Space,Str "nice",Space,Str "it",Space,Code ("",[],[]) "zfs send tank/storage/data/svn@daily-2014-03-20_00.00.00--2w | nice -15 bzip2 | ssh user@hyper.somewhere.org \"> /storage/c-3po/tank-storage-data-svn.dmp.bz2\""]] +[ Para + [ Quoted DoubleQuote [ Str "Hello" ] ] +, Para + [ Str "Same" + , Space + , Str "but" + , Space + , Str "bzip2" + , Space + , Str "it" + , Space + , Str "and" + , Space + , Str "nice" + , Space + , Str "it" + , Space + , Code + ( "" + , [] + , [] + ) "zfs send tank/storage/data/svn@daily-2014-03-20_00.00.00--2w | nice -15 bzip2 | ssh user@hyper.somewhere.org \"> /storage/c-3po/tank-storage-data-svn.dmp.bz2\"" + ] +] ``` ``` % pandoc -f mediawiki -t native "Hello" ^D -[Para [Str "\"Hello\""]] +[ Para [ Str "\"Hello\"" ] ] ``` diff --git a/test/command/3587.md b/test/command/3587.md index 3016afa5a..402ad7d9f 100644 --- a/test/command/3587.md +++ b/test/command/3587.md @@ -2,14 +2,36 @@ % pandoc -f latex -t native \SI[round-precision=2]{1}{m} is equal to \SI{1000}{mm} ^D -[Para [Str "1\160m",Space,Str "is",Space,Str "equal",Space,Str "to",Space,Str "1000\160mm"]] +[ Para + [ Str "1\160m" + , Space + , Str "is" + , Space + , Str "equal" + , Space + , Str "to" + , Space + , Str "1000\160mm" + ] +] ``` ``` % pandoc -f latex -t native \SI[round-precision=2]{1}[\$]{} is equal to \SI{0.938094}{\euro} ^D -[Para [Str "$\160\&1",Space,Str "is",Space,Str "equal",Space,Str "to",Space,Str "0.938094\160\8364"]] +[ Para + [ Str "$\160\&1" + , Space + , Str "is" + , Space + , Str "equal" + , Space + , Str "to" + , Space + , Str "0.938094\160\8364" + ] +] ``` @@ -17,35 +39,35 @@ % pandoc -f latex -t native \SI{30}{\milli\meter} ^D -[Para [Str "30\160mm"]] +[ Para [ Str "30\160mm" ] ] ``` ``` % pandoc -f latex -t native \SI{6}{\gram} ^D -[Para [Str "6\160g"]] +[ Para [ Str "6\160g" ] ] ``` ``` % pandoc -f latex -t native \SI{25}{\square\meter} ^D -[Para [Str "25\160m",Superscript [Str "2"]]] +[ Para [ Str "25\160m", Superscript [ Str "2" ] ] ] ``` ``` % pandoc -f latex -t native \SI{18.2}{\degreeCelsius} ^D -[Para [Str "18.2\160\176C"]] +[ Para [ Str "18.2\160\176C" ] ] ``` ``` % pandoc -f latex -t native \SI{18.2}{\celsius} ^D -[Para [Str "18.2\160\176C"]] +[ Para [ Str "18.2\160\176C" ] ] ``` # SIrange tests @@ -56,19 +78,19 @@ % pandoc -f latex -t native \SIrange{10}{20}{\gram} ^D -[Para [Str "10\160g\8211\&20\160g"]] +[ Para [ Str "10\160g\8211\&20\160g" ] ] ``` ``` % pandoc -f latex -t native \SIrange{35}{9}{\milli\meter} ^D -[Para [Str "35\160mm\8211\&9\160mm"]] +[ Para [ Str "35\160mm\8211\&9\160mm" ] ] ``` ``` % pandoc -f latex -t native \SIrange{4}{97367265}{\celsius} ^D -[Para [Str "4\160\176C\8211\&97367265\160\176C"]] +[ Para [ Str "4\160\176C\8211\&97367265\160\176C" ] ] ``` ## Decimal range with simple units @@ -77,7 +99,7 @@ % pandoc -f latex -t native \SIrange{4.5}{97367265.5}{\celsius} ^D -[Para [Str "4.5\160\176C\8211\&97367265.5\160\176C"]] +[ Para [ Str "4.5\160\176C\8211\&97367265.5\160\176C" ] ] ``` ## Squared, cubed etc. units @@ -86,21 +108,45 @@ % pandoc -f latex -t native \SIrange{10}{20}{\square\meter} ^D -[Para [Str "10\160m",Superscript [Str "2"],Str "\8211\&20\160m",Superscript [Str "2"]]] +[ Para + [ Str "10\160m" + , Superscript + [ Str "2" ] + , Str "\8211\&20\160m" + , Superscript + [ Str "2" ] + ] +] ``` ``` % pandoc -f latex -t native \SIrange{10}{20}{\cubic\meter} ^D -[Para [Str "10\160m",Superscript [Str "3"],Str "\8211\&20\160m",Superscript [Str "3"]]] +[ Para + [ Str "10\160m" + , Superscript + [ Str "3" ] + , Str "\8211\&20\160m" + , Superscript + [ Str "3" ] + ] +] ``` ``` % pandoc -f latex -t native \SIrange{10}{20}{\raisetothe{4}\meter} ^D -[Para [Str "10\160m",Superscript [Str "4"],Str "\8211\&20\160m",Superscript [Str "4"]]] +[ Para + [ Str "10\160m" + , Superscript + [ Str "4" ] + , Str "\8211\&20\160m" + , Superscript + [ Str "4" ] + ] +] ``` @@ -108,21 +154,45 @@ % pandoc -f latex -t native \SIrange{10}{20}{\meter\squared} ^D -[Para [Str "10\160m",Superscript [Str "2"],Str "\8211\&20\160m",Superscript [Str "2"]]] +[ Para + [ Str "10\160m" + , Superscript + [ Str "2" ] + , Str "\8211\&20\160m" + , Superscript + [ Str "2" ] + ] +] ``` ``` % pandoc -f latex -t native \SIrange{10}{20}{\meter\cubed} ^D -[Para [Str "10\160m",Superscript [Str "3"],Str "\8211\&20\160m",Superscript [Str "3"]]] +[ Para + [ Str "10\160m" + , Superscript + [ Str "3" ] + , Str "\8211\&20\160m" + , Superscript + [ Str "3" ] + ] +] ``` ``` % pandoc -f latex -t native \SIrange{10}{20}{\meter\tothe{4}} ^D -[Para [Str "10\160m",Superscript [Str "4"],Str "\8211\&20\160m",Superscript [Str "4"]]] +[ Para + [ Str "10\160m" + , Superscript + [ Str "4" ] + , Str "\8211\&20\160m" + , Superscript + [ Str "4" ] + ] +] ``` @@ -136,12 +206,12 @@ % pandoc -f latex -t native \SIrange[round-precision=2]{10}{20}{\gram} ^D -[Para [Str "10\160g\8211\&20\160g"]] +[ Para [ Str "10\160g\8211\&20\160g" ] ] ``` ``` % pandoc -f latex -t native \SIrange[round-precision=2]{10.0}{20.25}{\gram} ^D -[Para [Str "10.0\160g\8211\&20.25\160g"]] +[ Para [ Str "10.0\160g\8211\&20.25\160g" ] ] ``` diff --git a/test/command/3681.md b/test/command/3681.md index d0805e820..e374f1c35 100644 --- a/test/command/3681.md +++ b/test/command/3681.md @@ -4,7 +4,34 @@ Software developers create \cicd pipelines to… Following issue can be resolved by \cicd: ^D -[Para [Str "Software",Space,Str "developers",Space,Str "create",Space,Str "CI/CD",Space,Str "pipelines",Space,Str "to\8230",Space,Str "Following",Space,Str "issue",Space,Str "can",Space,Str "be",Space,Str "resolved",Space,Str "by",Space,Str "CI/CD:"]] +[ Para + [ Str "Software" + , Space + , Str "developers" + , Space + , Str "create" + , Space + , Str "CI/CD" + , Space + , Str "pipelines" + , Space + , Str "to\8230" + , Space + , Str "Following" + , Space + , Str "issue" + , Space + , Str "can" + , Space + , Str "be" + , Space + , Str "resolved" + , Space + , Str "by" + , Space + , Str "CI/CD:" + ] +] ``` ``` @@ -13,7 +40,22 @@ Software developers create \cicd pipelines to… Following issue can be resolved \cicd\footnote{\url{https://en.wikipedia.org/wiki/CI/CD}} is awesome. ^D -[Para [Str "CI/CD",Note [Para [Link ("",[],[]) [Str "https://en.wikipedia.org/wiki/CI/CD"] ("https://en.wikipedia.org/wiki/CI/CD","")]],Space,Str "is",Space,Str "awesome."]] +[ Para + [ Str "CI/CD" + , Note + [ Para + [ Link + ( "", [], [] ) + [ Str "https://en.wikipedia.org/wiki/CI/CD" ] + ( "https://en.wikipedia.org/wiki/CI/CD", "" ) + ] + ] + , Space + , Str "is" + , Space + , Str "awesome." + ] +] ``` ``` @@ -23,5 +65,5 @@ Software developers create \cicd pipelines to… Following issue can be resolved \cicd\pipeline. ^D -[Para [Str "CI/CD",Space,Str "pipeline."]] +[ Para [ Str "CI/CD", Space, Str "pipeline." ] ] ``` diff --git a/test/command/3706.md b/test/command/3706.md index 361ff04f1..52e1eacbf 100644 --- a/test/command/3706.md +++ b/test/command/3706.md @@ -15,36 +15,80 @@ Results marker can be hidden in block attributes (#3706) | 2 | La | | 3 | La | ^D -[Div ("tab",[],[]) - [Table ("",[],[]) (Caption Nothing - [Plain [Str "Lalelu."]]) - [(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Id"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Desc"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "La"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "La"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "3"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "La"]]]])] - (TableFoot ("",[],[]) - [])]] +[ Div + ( "tab", [], [] ) + [ Table + ( "", [], [] ) + ( Caption Nothing [ Plain [ Str "Lalelu." ] ] ) + [ + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Id" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Desc" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "La" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "La" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "3" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "La" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) + ] +] ``` ``` diff --git a/test/command/3708.md b/test/command/3708.md index b4fc0da1b..435d6940c 100644 --- a/test/command/3708.md +++ b/test/command/3708.md @@ -5,24 +5,42 @@ C & D \end{tabular} ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignCenter,ColWidthDefault) - ,(AlignCenter,ColWidthDefault)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "A"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "B&1"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "C"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "D"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ ( AlignCenter, ColWidthDefault ), ( AlignCenter, ColWidthDefault ) ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "A" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "B&1" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "C" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "D" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/3733.md b/test/command/3733.md index b8a326938..90cdcff6c 100644 --- a/test/command/3733.md +++ b/test/command/3733.md @@ -6,8 +6,9 @@ some: code ``` ^D -[BulletList - [[Plain [Str "Item1"]] - ,[Plain [Str "Item2"]]] -,CodeBlock ("",["yaml"],[]) "some: code"] +[ BulletList + [ [ Plain [ Str "Item1" ] ], [ Plain [ Str "Item2" ] ] ] +, CodeBlock + ( "", [ "yaml" ], [] ) "some: code" +] ```` diff --git a/test/command/3755.md b/test/command/3755.md index 5e1ffc921..b9f38d441 100644 --- a/test/command/3755.md +++ b/test/command/3755.md @@ -5,8 +5,19 @@ title: 'Titel' date: '22. Juni 2017' --- ^D -Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "22.",Space,Str "Juni",Space,Str "2017"]),("title",MetaInlines [Str "Titel"])]}) -[] +Pandoc + ( Meta + { unMeta = fromList + [ + ( "date" + , MetaInlines + [ Str "22.", Space, Str "Juni", Space, Str "2017" ] + ) + , + ( "title", MetaInlines [ Str "Titel" ] ) + ] + } + ) [] ``` ``` @@ -17,7 +28,24 @@ date: | 22. Juni 2017 --- ^D -Pandoc (Meta {unMeta = fromList [("date",MetaBlocks [OrderedList (22,Decimal,Period) [[Plain [Str "Juni",Space,Str "2017"]]]]),("title",MetaBlocks [Div ("",[],[]) [Plain [Str "foo"]]])]}) -[] +Pandoc + ( Meta + { unMeta = fromList + [ + ( "date" + , MetaBlocks + [ OrderedList + ( 22, Decimal, Period ) + [ [ Plain [ Str "Juni", Space, Str "2017" ] ] ] + ] + ) + , + ( "title" + , MetaBlocks + [ Div ( "", [], [] ) [ Plain [ Str "foo" ] ] ] + ) + ] + } + ) [] ``` diff --git a/test/command/3779.md b/test/command/3779.md index 1097123f0..45c91a92c 100644 --- a/test/command/3779.md +++ b/test/command/3779.md @@ -20,9 +20,40 @@ Pandoc is 300\% awesome. } ^D -[BulletList - [[Para [Str "Pandoc",Space,Str "is",Space,Str "100%",Space,Str "awesome."]]] -,BulletList - [[Para [Str "Pandoc",Space,Str "is",Space,Str "200%",Space,Str "awesome."]]] -,Para [Str "Pandoc",Space,Str "is",Space,Str "300%",Space,Str "awesome."]] +[ BulletList + [ + [ Para + [ Str "Pandoc" + , Space + , Str "is" + , Space + , Str "100%" + , Space + , Str "awesome." + ] + ] + ] +, BulletList + [ + [ Para + [ Str "Pandoc" + , Space + , Str "is" + , Space + , Str "200%" + , Space + , Str "awesome." + ] + ] + ] +, Para + [ Str "Pandoc" + , Space + , Str "is" + , Space + , Str "300%" + , Space + , Str "awesome." + ] +] ``` diff --git a/test/command/3794.md b/test/command/3794.md index b56e7b504..571fb848d 100644 --- a/test/command/3794.md +++ b/test/command/3794.md @@ -2,6 +2,5 @@ % pandoc -f html -t native <div><p>hello</div> ^D -[Div ("",[],[]) - [Para [Str "hello"]]] +[ Div ( "", [], [] ) [ Para [ Str "hello" ] ] ] ``` diff --git a/test/command/3804.md b/test/command/3804.md index 520d408df..b80b1ce5a 100644 --- a/test/command/3804.md +++ b/test/command/3804.md @@ -2,5 +2,7 @@ % pandoc -t native \titleformat{\chapter}[display]{\normalfont\large\bfseries}{第\thechapter{}章}{20pt}{\Huge} ^D -[RawBlock (Format "tex") "\\titleformat{\\chapter}[display]{\\normalfont\\large\\bfseries}{\31532\\thechapter{}\31456}{20pt}{\\Huge}"] +[ RawBlock + ( Format "tex" ) "\\titleformat{\\chapter}[display]{\\normalfont\\large\\bfseries}{\31532\\thechapter{}\31456}{20pt}{\\Huge}" +] ``` diff --git a/test/command/3853.md b/test/command/3853.md index 19e8e2260..6b8be15c5 100644 --- a/test/command/3853.md +++ b/test/command/3853.md @@ -20,7 +20,11 @@ more hello \iftoggle{ebook}{ebook}{noebook} ^D -[Para [Str "ebook",SoftBreak,Str "more"] -,Para [Str "not",Space,Str "ebook",SoftBreak,Str "more"] -,Para [Str "hello",Space,Str "noebook"]] +[ Para + [ Str "ebook", SoftBreak, Str "more" ] +, Para + [ Str "not", Space, Str "ebook", SoftBreak, Str "more" ] +, Para + [ Str "hello", Space, Str "noebook" ] +] ``` diff --git a/test/command/3880.md b/test/command/3880.md index 700b44991..ff68c6c8a 100644 --- a/test/command/3880.md +++ b/test/command/3880.md @@ -2,5 +2,5 @@ % pandoc -f rst -t native .. include:: command/3880.txt ^D -[Para [Str "hi"]] +[ Para [ Str "hi" ] ] ``` diff --git a/test/command/3916.md b/test/command/3916.md index 9ac0834d7..47cd72861 100644 --- a/test/command/3916.md +++ b/test/command/3916.md @@ -4,8 +4,16 @@ <pre>blabla</pre> # more ^D -[OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "text",Space,Str "text"] - ,CodeBlock ("",[],[]) "blabla"] - ,[Plain [Str "more"]]]] +[ OrderedList + ( 1, DefaultStyle, DefaultDelim ) + [ + [ Plain + [ Str "text", Space, Str "text" ] + , CodeBlock + ( "", [], [] ) "blabla" + ] + , + [ Plain [ Str "more" ] ] + ] +] ``` diff --git a/test/command/3947.md b/test/command/3947.md index b1d695fbd..095b26767 100644 --- a/test/command/3947.md +++ b/test/command/3947.md @@ -6,6 +6,9 @@ Another Code block ^D -[RawBlock (Format "tex") "\\newpage" -,CodeBlock ("",[],[]) "Code block\n\nAnother Code block"] +[ RawBlock + ( Format "tex" ) "\\newpage" +, CodeBlock + ( "", [], [] ) "Code block\n\nAnother Code block" +] ``` diff --git a/test/command/3958.md b/test/command/3958.md index 1793dd05c..cf93d0f74 100644 --- a/test/command/3958.md +++ b/test/command/3958.md @@ -2,19 +2,19 @@ % pandoc -f latex -t native \texttt{"hi"} ^D -[Para [Code ("",[],[]) "\"hi\""]] +[ Para [ Code ( "", [], [] ) "\"hi\"" ] ] ``` ``` % pandoc -f latex -t native \texttt{``hi''} ^D -[Para [Code ("",[],[]) "\8220hi\8221"]] +[ Para [ Code ( "", [], [] ) "\8220hi\8221" ] ] ``` ``` % pandoc -f latex -t native \texttt{`hi'} ^D -[Para [Code ("",[],[]) "\8216hi\8217"]] +[ Para [ Code ( "", [], [] ) "\8216hi\8217" ] ] ``` diff --git a/test/command/3971.md b/test/command/3971.md index 533540743..013125444 100644 --- a/test/command/3971.md +++ b/test/command/3971.md @@ -5,5 +5,5 @@ \code{f} \end{document} ^D -[Para [Code ("",[],[]) "f"]] +[ Para [ Code ( "", [], [] ) "f" ] ] ``` diff --git a/test/command/3983.md b/test/command/3983.md index c2fbec32f..4af4bc3eb 100644 --- a/test/command/3983.md +++ b/test/command/3983.md @@ -5,8 +5,11 @@ \graphicspath\expandafter{\expandafter{\filename@area}}% \makeatother ^D -[RawBlock (Format "latex") "\\makeatletter" -,RawBlock (Format "latex") "\\makeatother"] +[ RawBlock + ( Format "latex" ) "\\makeatletter" +, RawBlock + ( Format "latex" ) "\\makeatother" +] ``` ``` @@ -16,8 +19,11 @@ \DeclareRobustCommand{\urlfootnote}{\hyper@normalise\urlfootnote@} \makeatother ^D -[RawBlock (Format "latex") "\\makeatletter" -,RawBlock (Format "latex") "\\makeatother"] +[ RawBlock + ( Format "latex" ) "\\makeatletter" +, RawBlock + ( Format "latex" ) "\\makeatother" +] ``` ``` @@ -25,5 +31,5 @@ \def\foo{bar} \expandafter\bam\foo ^D -[RawBlock (Format "latex") "\\bambar"] +[ RawBlock ( Format "latex" ) "\\bambar" ] ``` diff --git a/test/command/3989.md b/test/command/3989.md index e0caaf50e..75872a102 100644 --- a/test/command/3989.md +++ b/test/command/3989.md @@ -3,5 +3,22 @@ <span title="1st line of text <br> 2nd line of text">foo</span> <span title="1st line of text <br> 2nd line of text">foo</span> ^D -[Para [Span ("",[],[("title","1st line of text <br> 2nd line of text")]) [Str "foo"],SoftBreak,Span ("",[],[("title","1st line of text <br> 2nd line of text")]) [Str "foo"]]] +[ Para + [ Span + ( "" + , [] + , + [ ( "title", "1st line of text <br> 2nd line of text" ) ] + ) + [ Str "foo" ] + , SoftBreak + , Span + ( "" + , [] + , + [ ( "title", "1st line of text <br> 2nd line of text" ) ] + ) + [ Str "foo" ] + ] +] ``` diff --git a/test/command/4007.md b/test/command/4007.md index c18ea9366..974a88ab9 100644 --- a/test/command/4007.md +++ b/test/command/4007.md @@ -3,7 +3,7 @@ \newcommand\arrow\to $a\arrow b$ ^D -[Para [Math InlineMath "a\\to b"]] +[ Para [ Math InlineMath "a\\to b" ] ] ``` ``` @@ -11,7 +11,7 @@ $a\arrow b$ \newcommand\pfeil[1]{\to #1} $a\pfeil b$ ^D -[Para [Math InlineMath "a\\to b"]] +[ Para [ Math InlineMath "a\\to b" ] ] ``` ``` @@ -19,5 +19,5 @@ $a\pfeil b$ \newcommand\fleche{\to} $a\fleche b$ ^D -[Para [Math InlineMath "a\\to b"]] +[ Para [ Math InlineMath "a\\to b" ] ] ``` diff --git a/test/command/4054.md b/test/command/4054.md index 3689773c4..9afef48b5 100644 --- a/test/command/4054.md +++ b/test/command/4054.md @@ -2,13 +2,17 @@ % pandoc -t native -s -M title=New % Old ^D -Pandoc (Meta {unMeta = fromList [("title",MetaString "New")]}) -[] +Pandoc + ( Meta { unMeta = fromList [ ( "title", MetaString "New" ) ] } ) [] ``` ``` % pandoc -t native -s -M foo=1 -M foo=2 ^D -Pandoc (Meta {unMeta = fromList [("foo",MetaList [MetaString "1",MetaString "2"])]}) -[] +Pandoc + ( Meta + { unMeta = fromList + [ ( "foo", MetaList [ MetaString "1", MetaString "2" ] ) ] + } + ) [] ``` diff --git a/test/command/4056.md b/test/command/4056.md index 2f5111aeb..3b2341644 100644 --- a/test/command/4056.md +++ b/test/command/4056.md @@ -5,7 +5,9 @@ \end{shaded} } ^D -[RawBlock (Format "tex") "\\parbox[t]{0.4\\textwidth}{\n\\begin{shaded}\n\\end{shaded}\n}"] +[ RawBlock + ( Format "tex" ) "\\parbox[t]{0.4\\textwidth}{\n\\begin{shaded}\n\\end{shaded}\n}" +] ``` ``` @@ -14,22 +16,40 @@ Blah & Foo & Bar \\ \end{tabular} ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignLeft,ColWidthDefault) - ,(AlignRight,ColWidthDefault) - ,(AlignRight,ColWidthDefault)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Blah"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Foo"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Bar"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignLeft, ColWidthDefault ) + , + ( AlignRight, ColWidthDefault ) + , + ( AlignRight, ColWidthDefault ) + ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Blah" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Foo" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Bar" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/4063.md b/test/command/4063.md index 838472b46..ca7b3007e 100644 --- a/test/command/4063.md +++ b/test/command/4063.md @@ -11,19 +11,29 @@ </tr> </table> ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidth 0.3) - ,(AlignDefault,ColWidth 0.7)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "2"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ ( AlignDefault, ColWidth 0.3 ), ( AlignDefault, ColWidth 0.7 ) ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "2" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/4068.md b/test/command/4068.md index ddd1aaee4..53fb660d0 100644 --- a/test/command/4068.md +++ b/test/command/4068.md @@ -4,6 +4,25 @@ [http://domain.com?a=. open productname bugs] ^D -[Para [Link ("",[],[]) [Str "open",Space,Str "productname",Space,Str "bugs"] ("https://domain.com/script.php?a=1&b=2&c=&d=4","")] -,Para [Str "[",Link ("",[],[]) [Str "http://domain.com?a="] ("http://domain.com?a=",""),Str ".",Space,Str "open",Space,Str "productname",Space,Str "bugs]"]] +[ Para + [ Link + ( "", [], [] ) + [ Str "open", Space, Str "productname", Space, Str "bugs" ] + ( "https://domain.com/script.php?a=1&b=2&c=&d=4", "" ) + ] +, Para + [ Str "[" + , Link + ( "", [], [] ) + [ Str "http://domain.com?a=" ] + ( "http://domain.com?a=", "" ) + , Str "." + , Space + , Str "open" + , Space + , Str "productname" + , Space + , Str "bugs]" + ] +] ``` diff --git a/test/command/4119.md b/test/command/4119.md index 0f7da5fe0..e41991874 100644 --- a/test/command/4119.md +++ b/test/command/4119.md @@ -8,25 +8,52 @@ not a caption! :::::::::::::::: ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "col1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "col2"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "2"]]]])] - (TableFoot ("",[],[]) - []) -,Div ("",["notes"],[]) - [Para [Str "not",Space,Str "a",Space,Str "caption!"]]] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "col1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "col2" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "2" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +, Div + ( "", [ "notes" ], [] ) + [ Para [ Str "not", Space, Str "a", Space, Str "caption!" ] ] +] ``` diff --git a/test/command/4134.md b/test/command/4134.md index b5473d948..d850e5740 100644 --- a/test/command/4134.md +++ b/test/command/4134.md @@ -3,7 +3,7 @@ Hello.\ world. ^D -[Para [Str "Hello.\160world."]] +[ Para [ Str "Hello.\160world." ] ] ``` ``` @@ -11,7 +11,7 @@ world. Hello.\ world. ^D -[Para [Str "Hello.\160world."]] +[ Para [ Str "Hello.\160world." ] ] ``` ``` @@ -20,6 +20,5 @@ Hello.\ World. ^D -[Para [Str "Hello.\160"] -,Para [Str "World."]] +[ Para [ Str "Hello.\160" ], Para [ Str "World." ] ] ``` diff --git a/test/command/4159.md b/test/command/4159.md index d61959950..1451a03df 100644 --- a/test/command/4159.md +++ b/test/command/4159.md @@ -3,6 +3,9 @@ \newcommand{\gen}{a\ Gen\ b} abc ^D -[RawBlock (Format "tex") "\\newcommand{\\gen}{a\\ Gen\\ b}" -,Para [Str "abc"]] +[ RawBlock + ( Format "tex" ) "\\newcommand{\\gen}{a\\ Gen\\ b}" +, Para + [ Str "abc" ] +] ``` diff --git a/test/command/4162.md b/test/command/4162.md index d88e1ec4e..ca54cf953 100644 --- a/test/command/4162.md +++ b/test/command/4162.md @@ -3,8 +3,5 @@ <div class="line-block">hi<br /><br> there</div> ^D -[LineBlock - [[Str "hi"] - ,[] - ,[Str "\160there"]]] +[ LineBlock [ [ Str "hi" ], [], [ Str "\160there" ] ] ] ``` diff --git a/test/command/4183.md b/test/command/4183.md index c18320882..cf889af73 100644 --- a/test/command/4183.md +++ b/test/command/4183.md @@ -4,7 +4,7 @@ <img src="foo" alt="bar"> </figure> ^D -[Para [Image ("",[],[]) [] ("foo","fig:")]] +[ Para [ Image ( "", [], [] ) [] ( "foo", "fig:" ) ] ] ``` ``` @@ -18,7 +18,7 @@ </figcaption> </figure> ^D -[Para [Image ("",[],[]) [Str "baz"] ("foo","fig:")]] +[ Para [ Image ( "", [], [] ) [ Str "baz" ] ( "foo", "fig:" ) ] ] ``` ``` @@ -28,5 +28,7 @@ <figcaption><p><em>baz</em></p></figcaption> </figure> ^D -[Para [Image ("",[],[]) [Emph [Str "baz"]] ("foo","fig:")]] +[ Para + [ Image ( "", [], [] ) [ Emph [ Str "baz" ] ] ( "foo", "fig:" ) ] +] ``` diff --git a/test/command/4186.md b/test/command/4186.md index 8c0d04a31..9ac457748 100644 --- a/test/command/4186.md +++ b/test/command/4186.md @@ -4,7 +4,12 @@ This should retain the four leading spaces #+end_example ^D -[CodeBlock ("",["example"],[]) " This should retain the four leading spaces\n"] +[ CodeBlock + ( "" + , [ "example" ] + , [] + ) " This should retain the four leading spaces\n" +] ``` ``` diff --git a/test/command/4193.md b/test/command/4193.md index 44c7d70cc..f659349fd 100644 --- a/test/command/4193.md +++ b/test/command/4193.md @@ -4,7 +4,5 @@ a - b ^D -[BulletList - [[Plain [Str "a"]] - ,[Plain [Str "b"]]]] +[ BulletList [ [ Plain [ Str "a" ] ], [ Plain [ Str "b" ] ] ] ] ``` diff --git a/test/command/4199.md b/test/command/4199.md index 49d2bdbcb..953917f58 100644 --- a/test/command/4199.md +++ b/test/command/4199.md @@ -2,5 +2,5 @@ % pandoc -f latex -t native \foreignlanguage{ngerman}{foo} ^D -[Para [Span ("",[],[("lang","de-DE")]) [Str "foo"]]] +[ Para [ Span ( "", [], [ ( "lang", "de-DE" ) ] ) [ Str "foo" ] ] ] ``` diff --git a/test/command/4240.md b/test/command/4240.md index 39a7d2adf..861184728 100644 --- a/test/command/4240.md +++ b/test/command/4240.md @@ -25,9 +25,27 @@ header3 header4 ~~~~~~~ ^D -Pandoc (Meta {unMeta = fromList [("subtitle",MetaInlines [Str "Subtitle"]),("title",MetaInlines [Str "Title"])]}) -[Header 1 ("header1",[],[]) [Str "header1"] -,Header 2 ("header2",[],[]) [Str "header2"] -,Header 3 ("id",[],[]) [Str "header3"] -,Header 3 ("id3",[],[]) [Str "header4",Span ("id2",[],[]) []]] +Pandoc + ( Meta + { unMeta = fromList + [ + ( "subtitle", MetaInlines [ Str "Subtitle" ] ) + , + ( "title", MetaInlines [ Str "Title" ] ) + ] + } + ) + [ Header 1 + ( "header1", [], [] ) + [ Str "header1" ] + , Header 2 + ( "header2", [], [] ) + [ Str "header2" ] + , Header 3 + ( "id", [], [] ) + [ Str "header3" ] + , Header 3 + ( "id3", [], [] ) + [ Str "header4", Span ( "id2", [], [] ) [] ] + ] ``` diff --git a/test/command/4253.md b/test/command/4253.md index 01f5eea86..2c994a9fc 100644 --- a/test/command/4253.md +++ b/test/command/4253.md @@ -4,5 +4,5 @@ \noop{\newcommand{\foo}[1]{#1}} \foo{hi} ^D -[Para [Str "hi"]] +[ Para [ Str "hi" ] ] ``` diff --git a/test/command/4280.md b/test/command/4280.md index 6a89b5e63..5a198682b 100644 --- a/test/command/4280.md +++ b/test/command/4280.md @@ -3,5 +3,5 @@ Driver ------ ^D -[Header 1 ("driver",[],[]) [Str "Driver"]] +[ Header 1 ( "driver", [], [] ) [ Str "Driver" ] ] ``` diff --git a/test/command/4281.md b/test/command/4281.md index 9806e8178..db5119a5c 100644 --- a/test/command/4281.md +++ b/test/command/4281.md @@ -9,10 +9,18 @@ ::: :::: ^D -[Div ("",["a"],[]) - [BulletList - [[Div ("",["b"],[]) - [Para [Str "text"]] - ,Div ("",["c"],[]) - [Para [Str "text"]]]]]] +[ Div + ( "", [ "a" ], [] ) + [ BulletList + [ + [ Div + ( "", [ "b" ], [] ) + [ Para [ Str "text" ] ] + , Div + ( "", [ "c" ], [] ) + [ Para [ Str "text" ] ] + ] + ] + ] +] ``` diff --git a/test/command/4284.md b/test/command/4284.md index eddd1b03a..5c2ad9620 100644 --- a/test/command/4284.md +++ b/test/command/4284.md @@ -8,7 +8,31 @@ ** Children of headers with excluded tags should not appear :xylophone: * This should not appear :%: ^D -[Header 1 ("noexport-should-appear-if-not-specified-in-excludetags",[],[]) [Str "NOEXPORT",Space,Str "should",Space,Str "appear",Space,Str "if",Space,Str "not",Space,Str "specified",Space,Str "in",Space,Str "EXCLUDE",Subscript [Str "TAGS"],Space,Span ("",["tag"],[("tag-name","noexport")]) [SmallCaps [Str "noexport"]]]] +[ Header 1 + ( "noexport-should-appear-if-not-specified-in-excludetags", [], [] ) + [ Str "NOEXPORT" + , Space + , Str "should" + , Space + , Str "appear" + , Space + , Str "if" + , Space + , Str "not" + , Space + , Str "specified" + , Space + , Str "in" + , Space + , Str "EXCLUDE" + , Subscript + [ Str "TAGS" ] + , Space + , Span + ( "", [ "tag" ], [ ( "tag-name", "noexport" ) ] ) + [ SmallCaps [ Str "noexport" ] ] + ] +] ``` ``` @@ -17,7 +41,19 @@ * This should not appear :elephant: * This should appear :fawn: ^D -[Header 1 ("this-should-appear",[],[]) [Str "This",Space,Str "should",Space,Str "appear",Space,Span ("",["tag"],[("tag-name","fawn")]) [SmallCaps [Str "fawn"]]]] +[ Header 1 + ( "this-should-appear", [], [] ) + [ Str "This" + , Space + , Str "should" + , Space + , Str "appear" + , Space + , Span + ( "", [ "tag" ], [ ( "tag-name", "fawn" ) ] ) + [ SmallCaps [ Str "fawn" ] ] + ] +] ``` ``` @@ -28,7 +64,19 @@ * This should not appear :hippo: * This should appear :noexport: ^D -[Header 1 ("this-should-appear",[],[]) [Str "This",Space,Str "should",Space,Str "appear",Space,Span ("",["tag"],[("tag-name","noexport")]) [SmallCaps [Str "noexport"]]]] +[ Header 1 + ( "this-should-appear", [], [] ) + [ Str "This" + , Space + , Str "should" + , Space + , Str "appear" + , Space + , Span + ( "", [ "tag" ], [ ( "tag-name", "noexport" ) ] ) + [ SmallCaps [ Str "noexport" ] ] + ] +] ``` ``` @@ -36,5 +84,29 @@ #+EXCLUDE_TAGS: * NOEXPORT should appear if not specified in EXCLUDE_TAGS :noexport: ^D -[Header 1 ("noexport-should-appear-if-not-specified-in-excludetags",[],[]) [Str "NOEXPORT",Space,Str "should",Space,Str "appear",Space,Str "if",Space,Str "not",Space,Str "specified",Space,Str "in",Space,Str "EXCLUDE",Subscript [Str "TAGS"],Space,Span ("",["tag"],[("tag-name","noexport")]) [SmallCaps [Str "noexport"]]]] +[ Header 1 + ( "noexport-should-appear-if-not-specified-in-excludetags", [], [] ) + [ Str "NOEXPORT" + , Space + , Str "should" + , Space + , Str "appear" + , Space + , Str "if" + , Space + , Str "not" + , Space + , Str "specified" + , Space + , Str "in" + , Space + , Str "EXCLUDE" + , Subscript + [ Str "TAGS" ] + , Space + , Span + ( "", [ "tag" ], [ ( "tag-name", "noexport" ) ] ) + [ SmallCaps [ Str "noexport" ] ] + ] +] ``` diff --git a/test/command/4306.md b/test/command/4306.md index 82abd8005..3f5caa8fc 100644 --- a/test/command/4306.md +++ b/test/command/4306.md @@ -6,5 +6,18 @@ The file id is \nolinkurl{ESP_123_5235}. \end{document} ^D -[Para [Str "The",Space,Str "file",Space,Str "id",Space,Str "is",Space,Code ("",[],[]) "ESP_123_5235",Str "."]] +[ Para + [ Str "The" + , Space + , Str "file" + , Space + , Str "id" + , Space + , Str "is" + , Space + , Code + ( "", [], [] ) "ESP_123_5235" + , Str "." + ] +] ``` diff --git a/test/command/4374.md b/test/command/4374.md index 296c116a9..f7587999e 100644 --- a/test/command/4374.md +++ b/test/command/4374.md @@ -3,5 +3,18 @@ \cite{a% } ^D -[Para [Cite [Citation {citationId = "a", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\cite{a%\n}"]]] +[ Para + [ Cite + [ Citation + { citationId = "a" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline ( Format "latex" ) "\\cite{a%\n}" ] + ] +] ``` diff --git a/test/command/4382.md b/test/command/4382.md index 4a840489f..1eb9c3b64 100644 --- a/test/command/4382.md +++ b/test/command/4382.md @@ -4,7 +4,5 @@ ===== ^D -[BulletList - [[]] -,HorizontalRule] +[ BulletList [ [] ], HorizontalRule ] ``` diff --git a/test/command/4424.md b/test/command/4424.md index b0b95510b..a1b38544b 100644 --- a/test/command/4424.md +++ b/test/command/4424.md @@ -6,5 +6,5 @@ Test \end{document} ^D -[Para [Str "Test"]] +[ Para [ Str "Test" ] ] ``` diff --git a/test/command/4454.md b/test/command/4454.md index db0b0a406..8781b914c 100644 --- a/test/command/4454.md +++ b/test/command/4454.md @@ -3,7 +3,5 @@ • a • b ^D -[BulletList - [[Plain [Str "a"]] - ,[Plain [Str "b"]]]] +[ BulletList [ [ Plain [ Str "a" ] ], [ Plain [ Str "b" ] ] ] ] ``` diff --git a/test/command/4499.md b/test/command/4499.md index 073f76c0e..7a78860ea 100644 --- a/test/command/4499.md +++ b/test/command/4499.md @@ -9,7 +9,7 @@ % pandoc -f latex+raw_tex -t native \mbox{abc def} ^D -[Para [RawInline (Format "latex") "\\mbox{abc def}"]] +[ Para [ RawInline ( Format "latex" ) "\\mbox{abc def}" ] ] ``` ``` @@ -53,7 +53,7 @@ mno} pqr % pandoc -f latex+raw_tex -t native \hbox{abc def} ^D -[Para [RawInline (Format "latex") "\\hbox{abc def}"]] +[ Para [ RawInline ( Format "latex" ) "\\hbox{abc def}" ] ] ``` ``` diff --git a/test/command/4513.md b/test/command/4513.md index 88b0b672a..a149a699f 100644 --- a/test/command/4513.md +++ b/test/command/4513.md @@ -2,19 +2,32 @@ % pandoc -f textile -t native |_. heading 1 |_. heading 2| ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "heading",Space,Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "heading",Space,Str "2"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "heading", Space, Str "1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "heading", Space, Str "2" ] ] + ] + ] + ) + [ TableBody ( "", [], [] ) ( RowHeadColumns 0 ) [] [] ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/4528.md b/test/command/4528.md index 9b917f808..80be1df2c 100644 --- a/test/command/4528.md +++ b/test/command/4528.md @@ -30,6 +30,7 @@ This has <span class="smallcaps">small caps</span> in it. This has <s>strikeout</s> in it. ^D This has strikeout in it. +``` ``` % pandoc --wrap=none -f html -t commonmark+raw_html-strikeout diff --git a/test/command/4553.md b/test/command/4553.md index c179a3567..1d7a71cca 100644 --- a/test/command/4553.md +++ b/test/command/4553.md @@ -2,14 +2,13 @@ % pandoc -f latex -t native foo \include{command/bar} ^D -[Para [Str "foo"] -,Para [Emph [Str "hi",Space,Str "there"]]] +[ Para [ Str "foo" ], Para [ Emph [ Str "hi", Space, Str "there" ] ] ] ``` ``` % pandoc -f latex -t native foo \input{command/bar} ^D -[Para [Str "foo",Space,Emph [Str "hi",Space,Str "there"]]] +[ Para [ Str "foo", Space, Emph [ Str "hi", Space, Str "there" ] ] ] ``` diff --git a/test/command/4576.md b/test/command/4576.md index 1c82b96eb..85322d463 100644 --- a/test/command/4576.md +++ b/test/command/4576.md @@ -2,5 +2,5 @@ % pandoc -f latex -t native $\rho_\text{D$_2$O}=866$ ^D -[Para [Math InlineMath "\\rho_\\text{D$_2$O}=866"]] +[ Para [ Math InlineMath "\\rho_\\text{D$_2$O}=866" ] ] ``` diff --git a/test/command/4579.md b/test/command/4579.md index 8858f2351..f22494e16 100644 --- a/test/command/4579.md +++ b/test/command/4579.md @@ -8,23 +8,49 @@ * - spam - ham ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Foo"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Bar"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "spam"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "ham"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Foo" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Bar" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "spam" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "ham" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/4624.md b/test/command/4624.md index f9aa45596..dd46a564b 100644 --- a/test/command/4624.md +++ b/test/command/4624.md @@ -22,9 +22,15 @@ code4 \begin{verbatim} code5\end{verbatim} ^D -[CodeBlock ("",[],[("key1","value1")]) "code1\n" -,CodeBlock ("",[],[("key2","value2")]) "code2\n " -,CodeBlock ("",[],[]) "code3" -,CodeBlock ("",[],[]) "code4" -,CodeBlock ("",[],[]) "code5"] +[ CodeBlock + ( "", [], [ ( "key1", "value1" ) ] ) "code1\n" +, CodeBlock + ( "", [], [ ( "key2", "value2" ) ] ) "code2\n " +, CodeBlock + ( "", [], [] ) "code3" +, CodeBlock + ( "", [], [] ) "code4" +, CodeBlock + ( "", [], [] ) "code5" +] ``` diff --git a/test/command/4635.md b/test/command/4635.md index ad9af9c67..4b029604b 100644 --- a/test/command/4635.md +++ b/test/command/4635.md @@ -3,7 +3,7 @@ (cf. foo) ^D -[Para [Str "(cf.",SoftBreak,Str "foo)"]] +[ Para [ Str "(cf.", SoftBreak, Str "foo)" ] ] ``` ``` @@ -11,7 +11,7 @@ foo) a (cf. foo) ^D -[Para [Str "a",Space,Str "(cf.",SoftBreak,Str "foo)"]] +[ Para [ Str "a", Space, Str "(cf.", SoftBreak, Str "foo)" ] ] ``` ``` @@ -19,7 +19,7 @@ foo) cf. foo ^D -[Para [Str "cf.",SoftBreak,Str "foo"]] +[ Para [ Str "cf.", SoftBreak, Str "foo" ] ] ``` ``` @@ -27,5 +27,5 @@ foo a cf. foo ^D -[Para [Str "a",Space,Str "cf.",SoftBreak,Str "foo"]] +[ Para [ Str "a", Space, Str "cf.", SoftBreak, Str "foo" ] ] ``` diff --git a/test/command/4669.md b/test/command/4669.md index ade2ea0d8..20aaaca7e 100644 --- a/test/command/4669.md +++ b/test/command/4669.md @@ -6,8 +6,11 @@ while (n > 0) { \end{verbatim} ^D -[Para [Span ("",[],[]) [Code ("",[],[]) "<-"]] -,CodeBlock ("",[],[]) " while (n > 0) {"] +[ Para + [ Span ( "", [], [] ) [ Code ( "", [], [] ) "<-" ] ] +, CodeBlock + ( "", [], [] ) " while (n > 0) {" +] ``` ``` @@ -20,10 +23,17 @@ \item<beamer:2> five \end{itemize} ^D -[BulletList - [[Para [Str "one"]] - ,[Para [Str "two"]] - ,[Para [Str "three"]] - ,[Para [Str "four"]] - ,[Para [Str "five"]]]] +[ BulletList + [ + [ Para [ Str "one" ] ] + , + [ Para [ Str "two" ] ] + , + [ Para [ Str "three" ] ] + , + [ Para [ Str "four" ] ] + , + [ Para [ Str "five" ] ] + ] +] ``` diff --git a/test/command/4715.md b/test/command/4715.md index 50873c2b5..58ba70544 100644 --- a/test/command/4715.md +++ b/test/command/4715.md @@ -11,6 +11,26 @@ acquisizione-software.rst riuso-software.rst ^D -[Div ("tree1",["toctree","foo","bar"],[("caption","Indice dei contenuti"),("numbered",""),("maxdepth","3")]) - [Para [Str "premessa.rst",SoftBreak,Str "acquisizione-software.rst",SoftBreak,Str "riuso-software.rst"]]] +[ Div + ( "tree1" + , + [ "toctree", "foo", "bar" ] + , + [ + ( "caption", "Indice dei contenuti" ) + , + ( "numbered", "" ) + , + ( "maxdepth", "3" ) + ] + ) + [ Para + [ Str "premessa.rst" + , SoftBreak + , Str "acquisizione-software.rst" + , SoftBreak + , Str "riuso-software.rst" + ] + ] +] ``` diff --git a/test/command/4722.md b/test/command/4722.md index 6c8c14716..2a0ef086d 100644 --- a/test/command/4722.md +++ b/test/command/4722.md @@ -6,14 +6,25 @@ ***Level 3 *Level 1 ^D -[BulletList - [[Plain [Str "Level",Space,Str "1"]] - ,[Plain [Str "Level",Space,Str "1"] - ,BulletList - [[Plain [Str "Level",Space,Str "2"] - ,BulletList - [[Plain [Str "Level",Space,Str "3"]]]]]] - ,[Plain [Str "Level",Space,Str "1"]]]] +[ BulletList + [ + [ Plain [ Str "Level", Space, Str "1" ] ] + , + [ Plain + [ Str "Level", Space, Str "1" ] + , BulletList + [ + [ Plain + [ Str "Level", Space, Str "2" ] + , BulletList + [ [ Plain [ Str "Level", Space, Str "3" ] ] ] + ] + ] + ] + , + [ Plain [ Str "Level", Space, Str "1" ] ] + ] +] ``` ``` % pandoc -f tikiwiki -t native @@ -23,12 +34,26 @@ ###Level 3 #Level 1 ^D -[OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Level",Space,Str "1"]] - ,[Plain [Str "Level",Space,Str "1"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Level",Space,Str "2"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "Level",Space,Str "3"]]]]]] - ,[Plain [Str "Level",Space,Str "1"]]]] +[ OrderedList + ( 1, DefaultStyle, DefaultDelim ) + [ + [ Plain [ Str "Level", Space, Str "1" ] ] + , + [ Plain + [ Str "Level", Space, Str "1" ] + , OrderedList + ( 1, DefaultStyle, DefaultDelim ) + [ + [ Plain + [ Str "Level", Space, Str "2" ] + , OrderedList + ( 1, DefaultStyle, DefaultDelim ) + [ [ Plain [ Str "Level", Space, Str "3" ] ] ] + ] + ] + ] + , + [ Plain [ Str "Level", Space, Str "1" ] ] + ] +] ``` diff --git a/test/command/4742.md b/test/command/4742.md index 7be9a6077..45f42db5a 100644 --- a/test/command/4742.md +++ b/test/command/4742.md @@ -5,7 +5,17 @@ extension properly. % pandoc -f commonmark+gfm_auto_identifiers+ascii_identifiers -t native # non ascii ⚠️ räksmörgås ^D -[Header 1 ("non-ascii--raksmorgas",[],[]) [Str "non",Space,Str "ascii",Space,Str "\9888\65039",Space,Str "r\228ksm\246rg\229s"]] +[ Header 1 + ( "non-ascii--raksmorgas", [], [] ) + [ Str "non" + , Space + , Str "ascii" + , Space + , Str "\9888\65039" + , Space + , Str "r\228ksm\246rg\229s" + ] +] ``` Note that the emoji here is actually a composite character, @@ -16,7 +26,17 @@ so it survives... % pandoc -f commonmark+gfm_auto_identifiers-ascii_identifiers -t native # non ascii ⚠️ räksmörgås ^D -[Header 1 ("non-ascii-\65039-r\228ksm\246rg\229s",[],[]) [Str "non",Space,Str "ascii",Space,Str "\9888\65039",Space,Str "r\228ksm\246rg\229s"]] +[ Header 1 + ( "non-ascii-\65039-r\228ksm\246rg\229s", [], [] ) + [ Str "non" + , Space + , Str "ascii" + , Space + , Str "\9888\65039" + , Space + , Str "r\228ksm\246rg\229s" + ] +] ``` `gfm` should have `ascii_identifiers` disabled by default. @@ -25,5 +45,15 @@ so it survives... % pandoc -f gfm -t native # non ascii ⚠️ räksmörgås ^D -[Header 1 ("non-ascii-\65039-r\228ksm\246rg\229s",[],[]) [Str "non",Space,Str "ascii",Space,Str "\9888\65039",Space,Str "r\228ksm\246rg\229s"]] +[ Header 1 + ( "non-ascii-\65039-r\228ksm\246rg\229s", [], [] ) + [ Str "non" + , Space + , Str "ascii" + , Space + , Str "\9888\65039" + , Space + , Str "r\228ksm\246rg\229s" + ] +] ``` diff --git a/test/command/4743.md b/test/command/4743.md index 49b4b6d59..08c807c9f 100644 --- a/test/command/4743.md +++ b/test/command/4743.md @@ -4,14 +4,34 @@ Test that emojis are wrapped in Span % pandoc -f commonmark+emoji -t native My:thumbsup:emoji:heart: ^D -[Para [Str "My",Span ("",["emoji"],[("data-emoji","thumbsup")]) [Str "\128077"],Str "emoji",Span ("",["emoji"],[("data-emoji","heart")]) [Str "\10084\65039"]]] +[ Para + [ Str "My" + , Span + ( "", [ "emoji" ], [ ( "data-emoji", "thumbsup" ) ] ) + [ Str "\128077" ] + , Str "emoji" + , Span + ( "", [ "emoji" ], [ ( "data-emoji", "heart" ) ] ) + [ Str "\10084\65039" ] + ] +] ``` ``` % pandoc -f markdown+emoji -t native My:thumbsup:emoji:heart: ^D -[Para [Str "My",Span ("",["emoji"],[("data-emoji","thumbsup")]) [Str "\128077"],Str "emoji",Span ("",["emoji"],[("data-emoji","heart")]) [Str "\10084\65039"]]] +[ Para + [ Str "My" + , Span + ( "", [ "emoji" ], [ ( "data-emoji", "thumbsup" ) ] ) + [ Str "\128077" ] + , Str "emoji" + , Span + ( "", [ "emoji" ], [ ( "data-emoji", "heart" ) ] ) + [ Str "\10084\65039" ] + ] +] ``` ``` diff --git a/test/command/4781.md b/test/command/4781.md index 8a75e09a0..59740373c 100644 --- a/test/command/4781.md +++ b/test/command/4781.md @@ -6,9 +6,13 @@ Markdown parsed *here* *But not here* ^D -[Para [Str "Markdown",Space,Str "parsed",Space,Emph [Str "here"]] -,RawBlock (Format "tex") "\\include{command/bar}" -,Para [Emph [Str "But",Space,Str "not",Space,Str "here"]]] +[ Para + [ Str "Markdown", Space, Str "parsed", Space, Emph [ Str "here" ] ] +, RawBlock + ( Format "tex" ) "\\include{command/bar}" +, Para + [ Emph [ Str "But", Space, Str "not", Space, Str "here" ] ] +] ``` ``` @@ -17,6 +21,14 @@ Markdown parsed *here* *But not here* ^D -[Para [Emph [Str "here"],Space,RawInline (Format "tex") "\\input{command/bar}"] -,Para [Emph [Str "But",Space,Str "not",Space,Str "here"]]] +[ Para + [ Emph + [ Str "here" ] + , Space + , RawInline + ( Format "tex" ) "\\input{command/bar}" + ] +, Para + [ Emph [ Str "But", Space, Str "not", Space, Str "here" ] ] +] ``` diff --git a/test/command/4811.md b/test/command/4811.md index 81a60d78d..33d49f8c8 100644 --- a/test/command/4811.md +++ b/test/command/4811.md @@ -6,8 +6,7 @@ No blank lines in inline interpreted roles: blank`:myrole: ^D -[Para [Str "`no"] -,Para [Str "blank`:myrole:"]] +[ Para [ Str "`no" ], Para [ Str "blank`:myrole:" ] ] ``` Backslash escape behaves properly in interpreted roles: @@ -18,8 +17,11 @@ Backslash escape behaves properly in interpreted roles: `hi\ there`:code: ^D -[Para [Superscript [Str "hithere"]] -,Para [Code ("",[],[]) "hi\\ there"]] +[ Para + [ Superscript [ Str "hithere" ] ] +, Para + [ Code ( "", [], [] ) "hi\\ there" ] +] ``` Backtick followed by alphanumeric doesn't end the span: @@ -27,7 +29,11 @@ Backtick followed by alphanumeric doesn't end the span: % pandoc -f rst -t native `hi`there`:myrole: ^D -[Para [Code ("",["interpreted-text"],[("role","myrole")]) "hi`there"]] +[ Para + [ Code + ( "", [ "interpreted-text" ], [ ( "role", "myrole" ) ] ) "hi`there" + ] +] ``` Newline is okay, as long as not blank: @@ -36,7 +42,11 @@ Newline is okay, as long as not blank: `hi there`:myrole: ^D -[Para [Code ("",["interpreted-text"],[("role","myrole")]) "hi\nthere"]] +[ Para + [ Code + ( "", [ "interpreted-text" ], [ ( "role", "myrole" ) ] ) "hi\nthere" + ] +] ``` Use span for title-reference: @@ -44,5 +54,5 @@ Use span for title-reference: % pandoc -f rst -t native `default` ^D -[Para [Span ("",["title-ref"],[]) [Str "default"]]] +[ Para [ Span ( "", [ "title-ref" ], [] ) [ Str "default" ] ] ] ``` diff --git a/test/command/4817.md b/test/command/4817.md index 7718e3b3a..600266771 100644 --- a/test/command/4817.md +++ b/test/command/4817.md @@ -5,6 +5,17 @@ foo: - bar: bam ... ^D -Pandoc (Meta {unMeta = fromList [("foo",MetaList [MetaMap (fromList [("bar",MetaInlines [Str "bam"])])])]}) -[] +Pandoc + ( Meta + { unMeta = fromList + [ + ( "foo" + , MetaList + [ MetaMap + ( fromList [ ( "bar", MetaInlines [ Str "bam" ] ) ] ) + ] + ) + ] + } + ) [] ``` diff --git a/test/command/4819.md b/test/command/4819.md index 548583387..5966b14f3 100644 --- a/test/command/4819.md +++ b/test/command/4819.md @@ -4,8 +4,10 @@ foo: 42 ... ^D -Pandoc (Meta {unMeta = fromList [("foo",MetaInlines [Str "42"])]}) -[] +Pandoc + ( Meta + { unMeta = fromList [ ( "foo", MetaInlines [ Str "42" ] ) ] } + ) [] ``` ``` @@ -14,8 +16,8 @@ Pandoc (Meta {unMeta = fromList [("foo",MetaInlines [Str "42"])]}) foo: true ... ^D -Pandoc (Meta {unMeta = fromList [("foo",MetaBool True)]}) -[] +Pandoc + ( Meta { unMeta = fromList [ ( "foo", MetaBool True ) ] } ) [] ``` ``` @@ -24,8 +26,8 @@ Pandoc (Meta {unMeta = fromList [("foo",MetaBool True)]}) foo: True ... ^D -Pandoc (Meta {unMeta = fromList [("foo",MetaBool True)]}) -[] +Pandoc + ( Meta { unMeta = fromList [ ( "foo", MetaBool True ) ] } ) [] ``` ``` @@ -34,8 +36,8 @@ Pandoc (Meta {unMeta = fromList [("foo",MetaBool True)]}) foo: FALSE ... ^D -Pandoc (Meta {unMeta = fromList [("foo",MetaBool False)]}) -[] +Pandoc + ( Meta { unMeta = fromList [ ( "foo", MetaBool False ) ] } ) [] ``` ``` @@ -44,7 +46,9 @@ Pandoc (Meta {unMeta = fromList [("foo",MetaBool False)]}) foo: no ... ^D -Pandoc (Meta {unMeta = fromList [("foo",MetaInlines [Str "no"])]}) -[] +Pandoc + ( Meta + { unMeta = fromList [ ( "foo", MetaInlines [ Str "no" ] ) ] } + ) [] ``` diff --git a/test/command/4832.md b/test/command/4832.md index 9ba40804c..6e8f9401e 100644 --- a/test/command/4832.md +++ b/test/command/4832.md @@ -2,20 +2,38 @@ % pandoc -f latex -t native \url{http://example.com/foo%20bar.htm} ^D -[Para [Link ("",[],[]) [Str "http://example.com/foo%20bar.htm"] ("http://example.com/foo%20bar.htm","")]] +[ Para + [ Link + ( "", [], [] ) + [ Str "http://example.com/foo%20bar.htm" ] + ( "http://example.com/foo%20bar.htm", "" ) + ] +] ``` ``` % pandoc -f latex -t native \url{http://example.com/foo{bar}.htm} ^D -[Para [Link ("",[],[]) [Str "http://example.com/foo{bar}.htm"] ("http://example.com/foo{bar}.htm","")]] +[ Para + [ Link + ( "", [], [] ) + [ Str "http://example.com/foo{bar}.htm" ] + ( "http://example.com/foo{bar}.htm", "" ) + ] +] ``` ``` % pandoc -f latex -t native \href{http://example.com/foo%20bar}{Foobar} ^D -[Para [Link ("",[],[]) [Str "Foobar"] ("http://example.com/foo%20bar","")]] +[ Para + [ Link + ( "", [], [] ) + [ Str "Foobar" ] + ( "http://example.com/foo%20bar", "" ) + ] +] ``` diff --git a/test/command/4842.md b/test/command/4842.md index 0403c4d11..e78d31412 100644 --- a/test/command/4842.md +++ b/test/command/4842.md @@ -2,5 +2,5 @@ % pandoc -f latex -t native \l ^D -[Para [Str "\322"]] +[ Para [ Str "\322" ] ] ``` diff --git a/test/command/4845.md b/test/command/4845.md index 093161ac7..092c48181 100644 --- a/test/command/4845.md +++ b/test/command/4845.md @@ -2,5 +2,15 @@ % pandoc -f html -t native x<a href="/foo"> leading trailing space </a>x ^D -[Plain [Str "x",Space,Link ("",[],[]) [Str "leading",Space,Str "trailing",Space,Str "space"] ("/foo",""),Space,Str "x"]] +[ Plain + [ Str "x" + , Space + , Link + ( "", [], [] ) + [ Str "leading", Space, Str "trailing", Space, Str "space" ] + ( "/foo", "" ) + , Space + , Str "x" + ] +] ``` diff --git a/test/command/4848.md b/test/command/4848.md index 2cd2bab34..3110b90cc 100644 --- a/test/command/4848.md +++ b/test/command/4848.md @@ -2,21 +2,29 @@ % pandoc -f latex -t native \enquote*{hi} ^D -[Para [Quoted SingleQuote [Str "hi"]]] +[ Para [ Quoted SingleQuote [ Str "hi" ] ] ] ``` ``` % pandoc -f latex -t native \foreignquote{italian}{hi} ^D -[Para [Quoted DoubleQuote [Span ("",[],[("lang","it")]) [Str "hi"]]]] +[ Para + [ Quoted DoubleQuote + [ Span ( "", [], [ ( "lang", "it" ) ] ) [ Str "hi" ] ] + ] +] ``` ``` % pandoc -f latex -t native \hyphenquote*{italian}{hi} ^D -[Para [Quoted SingleQuote [Span ("",[],[("lang","it")]) [Str "hi"]]]] +[ Para + [ Quoted SingleQuote + [ Span ( "", [], [ ( "lang", "it" ) ] ) [ Str "hi" ] ] + ] +] ``` ``` @@ -25,10 +33,13 @@ Lorem ipsum \blockquote{dolor sit amet} consectetuer. ^D -[Para [Str "Lorem",Space,Str "ipsum"] -,BlockQuote - [Para [Str "dolor",Space,Str "sit",Space,Str "amet"]] -,Para [Str "consectetuer."]] +[ Para + [ Str "Lorem", Space, Str "ipsum" ] +, BlockQuote + [ Para [ Str "dolor", Space, Str "sit", Space, Str "amet" ] ] +, Para + [ Str "consectetuer." ] +] ``` ``` @@ -37,11 +48,28 @@ Lorem ipsum \blockcquote[198]{Knu86}{dolor sit amet} consectetuer. ^D -[Para [Str "Lorem",Space,Str "ipsum"] -,BlockQuote - [Para [Str "dolor",Space,Str "sit",Space,Str "amet"] - ,Para [Cite [Citation {citationId = "Knu86", citationPrefix = [], citationSuffix = [Str "198"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] []]] -,Para [Str "consectetuer."]] +[ Para + [ Str "Lorem", Space, Str "ipsum" ] +, BlockQuote + [ Para + [ Str "dolor", Space, Str "sit", Space, Str "amet" ] + , Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = [] + , citationSuffix = + [ Str "198" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] [] + ] + ] +, Para + [ Str "consectetuer." ] +] ``` ``` @@ -50,10 +78,15 @@ Lorem ipsum \foreignblockquote{italian}{dolor sit amet} consectetuer. ^D -[Para [Str "Lorem",Space,Str "ipsum"] -,BlockQuote - [Div ("",[],[("lang","it")]) - [Para [Str "dolor",Space,Str "sit",Space,Str "amet"]]] -,Para [Str "consectetuer."]] +[ Para + [ Str "Lorem", Space, Str "ipsum" ] +, BlockQuote + [ Div + ( "", [], [ ( "lang", "it" ) ] ) + [ Para [ Str "dolor", Space, Str "sit", Space, Str "amet" ] ] + ] +, Para + [ Str "consectetuer." ] +] ``` diff --git a/test/command/4860.md b/test/command/4860.md index 9198f68d7..4fb0c9212 100644 --- a/test/command/4860.md +++ b/test/command/4860.md @@ -5,5 +5,16 @@ This is broken_. .. ***** REFERENCES FOLLOW ***** .. _broken: http://google.com ^D -[Para [Str "This",Space,Str "is",Space,Link ("",[],[]) [Str "broken"] ("http://google.com",""),Str "."]] +[ Para + [ Str "This" + , Space + , Str "is" + , Space + , Link + ( "", [], [] ) + [ Str "broken" ] + ( "http://google.com", "" ) + , Str "." + ] +] ``` diff --git a/test/command/4877.md b/test/command/4877.md index 070687345..d442de3b4 100644 --- a/test/command/4877.md +++ b/test/command/4877.md @@ -2,12 +2,12 @@ % pandoc -f html -t native My <script type="math/tex">\mathcal{D}</script> ^D -[Plain [Str "My",Space,Math InlineMath "\\mathcal{D}"]] +[ Plain [ Str "My", Space, Math InlineMath "\\mathcal{D}" ] ] ``` ``` % pandoc -f html -t native <script type="math/tex; mode=display">\mathcal{D}</script> ^D -[Plain [Math DisplayMath "\\mathcal{D}"]] +[ Plain [ Math DisplayMath "\\mathcal{D}" ] ] ``` diff --git a/test/command/4919.md b/test/command/4919.md index 029d1beff..165f427bb 100644 --- a/test/command/4919.md +++ b/test/command/4919.md @@ -7,8 +7,9 @@ V = \frac{K}{r^2} ^D -[Div ("tgtmath",[],[]) - [BlockQuote - [Para [Math DisplayMath "V = \\frac{K}{r^2}"]]]] +[ Div + ( "tgtmath", [], [] ) + [ BlockQuote [ Para [ Math DisplayMath "V = \\frac{K}{r^2}" ] ] ] +] ``` diff --git a/test/command/4928.md b/test/command/4928.md index d1e2b6db7..c779fb0a4 100644 --- a/test/command/4928.md +++ b/test/command/4928.md @@ -2,47 +2,225 @@ % pandoc -f latex -t native \cites(Multiprenote)(multipostnote)[23][42]{Knu86}[65]{Nie72} ^D -[Para [Cite [Citation {citationId = "Knu86", citationPrefix = [Str "Multiprenote",Space,Str "23"], citationSuffix = [Str "42"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "Nie72", citationPrefix = [], citationSuffix = [Str "65",Str ",",Space,Str "multipostnote"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\cites(Multiprenote)(multipostnote)[23][42]{Knu86}[65]{Nie72}"]]] +[ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = + [ Str "Multiprenote", Space, Str "23" ] + , citationSuffix = + [ Str "42" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "Nie72" + , citationPrefix = [] + , citationSuffix = + [ Str "65", Str ",", Space, Str "multipostnote" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + ( Format "latex" ) "\\cites(Multiprenote)(multipostnote)[23][42]{Knu86}[65]{Nie72}" + ] + ] +] ``` ``` % pandoc -f latex -t native \cites(Multiprenote)()[23][42]{Knu86}[65]{Nie72} ^D -[Para [Cite [Citation {citationId = "Knu86", citationPrefix = [Str "Multiprenote",Space,Str "23"], citationSuffix = [Str "42"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "Nie72", citationPrefix = [], citationSuffix = [Str "65"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\cites(Multiprenote)()[23][42]{Knu86}[65]{Nie72}"]]] +[ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = + [ Str "Multiprenote", Space, Str "23" ] + , citationSuffix = + [ Str "42" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "Nie72" + , citationPrefix = [] + , citationSuffix = + [ Str "65" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + ( Format "latex" ) "\\cites(Multiprenote)()[23][42]{Knu86}[65]{Nie72}" + ] + ] +] ``` ``` % pandoc -f latex -t native \cites()(multipostnote)[23][42]{Knu86}[65]{Nie72} ^D -[Para [Cite [Citation {citationId = "Knu86", citationPrefix = [Str "23"], citationSuffix = [Str "42"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "Nie72", citationPrefix = [], citationSuffix = [Str "65",Str ",",Space,Str "multipostnote"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\cites()(multipostnote)[23][42]{Knu86}[65]{Nie72}"]]] +[ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = + [ Str "23" ] + , citationSuffix = + [ Str "42" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "Nie72" + , citationPrefix = [] + , citationSuffix = + [ Str "65", Str ",", Space, Str "multipostnote" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + ( Format "latex" ) "\\cites()(multipostnote)[23][42]{Knu86}[65]{Nie72}" + ] + ] +] ``` ``` % pandoc -f latex -t native \cites()()[23][42]{Knu86}[65]{Nie72} ^D -[Para [Cite [Citation {citationId = "Knu86", citationPrefix = [Str "23"], citationSuffix = [Str "42"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "Nie72", citationPrefix = [], citationSuffix = [Str "65"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\cites()()[23][42]{Knu86}[65]{Nie72}"]]] +[ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = + [ Str "23" ] + , citationSuffix = + [ Str "42" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "Nie72" + , citationPrefix = [] + , citationSuffix = + [ Str "65" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + ( Format "latex" ) "\\cites()()[23][42]{Knu86}[65]{Nie72}" + ] + ] +] ``` ``` % pandoc -f latex -t native \cites(multipostnote)[23][42]{Knu86}[65]{Nie72} ^D -[Para [Cite [Citation {citationId = "Knu86", citationPrefix = [Str "23"], citationSuffix = [Str "42"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "Nie72", citationPrefix = [], citationSuffix = [Str "65",Str ",",Space,Str "multipostnote"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\cites(multipostnote)[23][42]{Knu86}[65]{Nie72}"]]] +[ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = + [ Str "23" ] + , citationSuffix = + [ Str "42" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "Nie72" + , citationPrefix = [] + , citationSuffix = + [ Str "65", Str ",", Space, Str "multipostnote" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + ( Format "latex" ) "\\cites(multipostnote)[23][42]{Knu86}[65]{Nie72}" + ] + ] +] ``` ``` % pandoc -f latex -t native \cites(Multiprenote)(multipostnote){Knu86} ^D -[Para [Cite [Citation {citationId = "Knu86", citationPrefix = [Str "Multiprenote"], citationSuffix = [Str ",",Space,Str "multipostnote"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\cites(Multiprenote)(multipostnote){Knu86}"]]] +[ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = + [ Str "Multiprenote" ] + , citationSuffix = + [ Str ",", Space, Str "multipostnote" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + ( Format "latex" ) "\\cites(Multiprenote)(multipostnote){Knu86}" + ] + ] +] ``` ``` % pandoc -f latex -t native \footcites(Multiprenote)(multipostnote)[23][42]{Knu86}[65]{Nie72} ^D -[Para [Note [Para [Cite [Citation {citationId = "Knu86", citationPrefix = [Str "Multiprenote",Space,Str "23"], citationSuffix = [Str "42"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "Nie72", citationPrefix = [], citationSuffix = [Str "65",Str ",",Space,Str "multipostnote"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\footcites(Multiprenote)(multipostnote)[23][42]{Knu86}[65]{Nie72}"],Str "."]]]] +[ Para + [ Note + [ Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = + [ Str "Multiprenote", Space, Str "23" ] + , citationSuffix = + [ Str "42" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + , Citation + { citationId = "Nie72" + , citationPrefix = [] + , citationSuffix = + [ Str "65", Str ",", Space, Str "multipostnote" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline + ( Format "latex" ) "\\footcites(Multiprenote)(multipostnote)[23][42]{Knu86}[65]{Nie72}" + ] + , Str "." + ] + ] + ] +] ``` diff --git a/test/command/4933.md b/test/command/4933.md index 4ab41e8a5..763b49ca3 100644 --- a/test/command/4933.md +++ b/test/command/4933.md @@ -2,5 +2,5 @@ % pandoc -f latex -t native \includegraphics{lalune} ^D -[Para [Image ("",[],[]) [Str "image"] ("lalune.jpg","")]] +[ Para [ Image ( "", [], [] ) [ Str "image" ] ( "lalune.jpg", "" ) ] ] ``` diff --git a/test/command/5014.md b/test/command/5014.md index a3aae4151..47965830c 100644 --- a/test/command/5014.md +++ b/test/command/5014.md @@ -13,18 +13,35 @@ </tbody> </table> ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Name"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Accounts"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ ( AlignDefault, ColWidthDefault ) ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Name" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Accounts" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/5079.md b/test/command/5079.md index a43c9840a..28bdf64d0 100644 --- a/test/command/5079.md +++ b/test/command/5079.md @@ -10,16 +10,24 @@ </tbody> </table> ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ ( AlignDefault, ColWidthDefault ) ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/5099.md b/test/command/5099.md index 19b067b79..316d021d9 100644 --- a/test/command/5099.md +++ b/test/command/5099.md @@ -2,12 +2,26 @@ % pandoc -t native (@citation ^D -[Para [Str "(",Cite [Citation {citationId = "citation", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 1, citationHash = 0}] [Str "@citation"]]] +[ Para + [ Str "(" + , Cite + [ Citation + { citationId = "citation" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "@citation" ] + ] +] ``` ``` % pandoc -t native ('asd') ^D -[Para [Str "(",Quoted SingleQuote [Str "asd"],Str ")"]] +[ Para [ Str "(", Quoted SingleQuote [ Str "asd" ], Str ")" ] ] ``` diff --git a/test/command/5178.md b/test/command/5178.md index feb2c4b99..d74830b17 100644 --- a/test/command/5178.md +++ b/test/command/5178.md @@ -22,8 +22,21 @@ unsafePerformIO main (+ 2 2) #+end_src ^D -[CodeBlock ("",["commonlisp","numberLines"],[("org-language","lisp"),("startFrom","20")]) "(+ 1 1)\n" -,CodeBlock ("",["commonlisp","numberLines","continuedSourceBlock"],[("org-language","lisp"),("startFrom","10")]) "(+ 2 2)\n"] +[ CodeBlock + ( "" + , + [ "commonlisp", "numberLines" ] + , + [ ( "org-language", "lisp" ), ( "startFrom", "20" ) ] + ) "(+ 1 1)\n" +, CodeBlock + ( "" + , + [ "commonlisp", "numberLines", "continuedSourceBlock" ] + , + [ ( "org-language", "lisp" ), ( "startFrom", "10" ) ] + ) "(+ 2 2)\n" +] ``` ``` diff --git a/test/command/5182.md b/test/command/5182.md index e11dd29f0..a26056a0e 100644 --- a/test/command/5182.md +++ b/test/command/5182.md @@ -2,5 +2,7 @@ % pandoc -f rst -t native .. include:: command/5182.txt ^D -[CodeBlock ("",["python","numberLines"],[]) "def func(x):\n return y"] +[ CodeBlock + ( "", [ "python", "numberLines" ], [] ) "def func(x):\n return y" +] ``` diff --git a/test/command/5271.md b/test/command/5271.md index 910ea5888..e80bc3468 100644 --- a/test/command/5271.md +++ b/test/command/5271.md @@ -7,6 +7,35 @@ abstract: | It consists of two paragraphs. ... ^D -Pandoc (Meta {unMeta = fromList [("abstract",MetaBlocks [Para [Str "This",Space,Str "is",Space,Str "the",Space,Str "abstract."],Para [Str "It",Space,Str "consists",Space,Str "of",Space,Str "two",Space,Str "paragraphs."]])]}) -[] +Pandoc + ( Meta + { unMeta = fromList + [ + ( "abstract" + , MetaBlocks + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "abstract." + ] + , Para + [ Str "It" + , Space + , Str "consists" + , Space + , Str "of" + , Space + , Str "two" + , Space + , Str "paragraphs." + ] + ] + ) + ] + } + ) [] ``` diff --git a/test/command/5285.md b/test/command/5285.md index 6085ec1a9..ebad9374e 100644 --- a/test/command/5285.md +++ b/test/command/5285.md @@ -7,11 +7,15 @@ - b ^D -[BulletList - [[Para [Str "a"] - ,Para [Str "b"]] - ,[Para [Str "a"]] - ,[Para [Str "b"]]]] +[ BulletList + [ + [ Para [ Str "a" ], Para [ Str "b" ] ] + , + [ Para [ Str "a" ] ] + , + [ Para [ Str "b" ] ] + ] +] ``` ``` @@ -23,10 +27,11 @@ > foo ^D -[BulletList - [[Para [Str "foo"] - ,Para [Str "foo"]] - ,[Para [Str "foo"] - ,BlockQuote - [Para [Str "foo"]]]]] +[ BulletList + [ + [ Para [ Str "foo" ], Para [ Str "foo" ] ] + , + [ Para [ Str "foo" ], BlockQuote [ Para [ Str "foo" ] ] ] + ] +] ``` diff --git a/test/command/5321.md b/test/command/5321.md index 83404632a..b0cfdb1b8 100644 --- a/test/command/5321.md +++ b/test/command/5321.md @@ -7,7 +7,9 @@ <graphic xlink:href="foo.png" xlink:alt-text="baz" /> </fig> ^D -[Para [Image ("fig-1",[],[]) [Str "bar"] ("foo.png","fig:")]] +[ Para + [ Image ( "fig-1", [], [] ) [ Str "bar" ] ( "foo.png", "fig:" ) ] +] ``` ``` @@ -20,5 +22,11 @@ <graphic xlink:href="foo.png" xlink:alt-text="baz" /> </fig> ^D -[Para [Image ("fig-1",[],[]) [Str "foo",LineBreak,Str "bar"] ("foo.png","fig:")]] +[ Para + [ Image + ( "fig-1", [], [] ) + [ Str "foo", LineBreak, Str "bar" ] + ( "foo.png", "fig:" ) + ] +] ``` diff --git a/test/command/5360.md b/test/command/5360.md index 924c1ea28..7aa8adfa3 100644 --- a/test/command/5360.md +++ b/test/command/5360.md @@ -8,12 +8,22 @@ </table> ::: ^D -[Div ("",["foo"],[]) - [RawBlock (Format "html") "<table>" - ,RawBlock (Format "html") "<tr>" - ,RawBlock (Format "html") "<td>" - ,Plain [Str "hi"] - ,RawBlock (Format "html") "</td>" - ,RawBlock (Format "html") "</tr>" - ,RawBlock (Format "html") "</table>"]] +[ Div + ( "", [ "foo" ], [] ) + [ RawBlock + ( Format "html" ) "<table>" + , RawBlock + ( Format "html" ) "<tr>" + , RawBlock + ( Format "html" ) "<td>" + , Plain + [ Str "hi" ] + , RawBlock + ( Format "html" ) "</td>" + , RawBlock + ( Format "html" ) "</tr>" + , RawBlock + ( Format "html" ) "</table>" + ] +] ``` diff --git a/test/command/5368.md b/test/command/5368.md index c755fde48..16cc4352c 100644 --- a/test/command/5368.md +++ b/test/command/5368.md @@ -12,12 +12,28 @@ Quux. ^D -[OrderedList (1,Decimal,Period) - [[Para [Str "foo"] - ,Para [Image ("",[],[]) [Str "bar"] ("bar.png","fig:")]] - ,[Para [Str "foo2"] - ,Para [Image ("",[],[]) [Str "bar2"] ("bar2.png","fig:")]] - ,[Para [Str "foo3"] - ,Para [Image ("",[],[]) [Str "foo3"] ("foo3.png","fig:")]]] -,Para [Str "Quux."]] +[ OrderedList + ( 1, Decimal, Period ) + [ + [ Para + [ Str "foo" ] + , Para + [ Image ( "", [], [] ) [ Str "bar" ] ( "bar.png", "fig:" ) ] + ] + , + [ Para + [ Str "foo2" ] + , Para + [ Image ( "", [], [] ) [ Str "bar2" ] ( "bar2.png", "fig:" ) ] + ] + , + [ Para + [ Str "foo3" ] + , Para + [ Image ( "", [], [] ) [ Str "foo3" ] ( "foo3.png", "fig:" ) ] + ] + ] +, Para + [ Str "Quux." ] +] ``` diff --git a/test/command/5410.md b/test/command/5410.md index fee90a1a4..752da51c5 100644 --- a/test/command/5410.md +++ b/test/command/5410.md @@ -3,5 +3,5 @@ .ie n \{\ 'br\} ^D -[Para [LineBreak]] +[ Para [ LineBreak ] ] ``` diff --git a/test/command/5416.md b/test/command/5416.md index 619f4223e..d97f9881e 100644 --- a/test/command/5416.md +++ b/test/command/5416.md @@ -2,12 +2,12 @@ % pandoc -f dokuwiki -t native { ^D -[Para [Str "{"]] +[ Para [ Str "{" ] ] ``` ``` % pandoc -f dokuwiki -t native {{ ^D -[Para [Str "{{"]] +[ Para [ Str "{{" ] ] ``` diff --git a/test/command/5540.md b/test/command/5540.md index 802a88d9d..c5157e611 100644 --- a/test/command/5540.md +++ b/test/command/5540.md @@ -4,5 +4,11 @@ Stay pure! \end{lstlisting} ^D -[CodeBlock ("",["myfunnylanguage"],[("language","myfunnylanguage")]) "Stay pure!"] +[ CodeBlock + ( "" + , [ "myfunnylanguage" ] + , + [ ( "language", "myfunnylanguage" ) ] + ) "Stay pure!" +] ``` diff --git a/test/command/5549.md b/test/command/5549.md index fa030d921..4a17226ef 100644 --- a/test/command/5549.md +++ b/test/command/5549.md @@ -4,6 +4,5 @@ [] ^D -[Header 2 ("section",[],[]) [] -,Para [Str "[]"]] +[ Header 2 ( "section", [], [] ) [], Para [ Str "[]" ] ] ``` diff --git a/test/command/5619.md b/test/command/5619.md index 776d57acc..dbf82c822 100644 --- a/test/command/5619.md +++ b/test/command/5619.md @@ -6,5 +6,32 @@ The caption. Here's what piggybacking on caption would look like {#fig:1} ^D -[Para [Image ("test",[],[("width","1in")]) [Str "The",Space,Str "caption.",Space,Str "Here's",Space,Str "what",Space,Str "piggybacking",Space,Str "on",Space,Str "caption",Space,Str "would",Space,Str "look",Space,Str "like",Space,Str "{#fig:1}"] ("img1.jpg","fig:")]] +[ Para + [ Image + ( "test", [], [ ( "width", "1in" ) ] ) + [ Str "The" + , Space + , Str "caption." + , Space + , Str "Here's" + , Space + , Str "what" + , Space + , Str "piggybacking" + , Space + , Str "on" + , Space + , Str "caption" + , Space + , Str "would" + , Space + , Str "look" + , Space + , Str "like" + , Space + , Str "{#fig:1}" + ] + ( "img1.jpg", "fig:" ) + ] +] ``` diff --git a/test/command/5682.md b/test/command/5682.md index 6d3b9fa0c..3ce81afb8 100644 --- a/test/command/5682.md +++ b/test/command/5682.md @@ -3,6 +3,6 @@ \newcommand{\ittakestwo}[2][defaultone]{#2} \ittakestwo[to]{tango} ^D -[Para [Str "tango"]] +[ Para [ Str "tango" ] ] ``` diff --git a/test/command/5686.md b/test/command/5686.md index 1c18109c3..445b732ed 100644 --- a/test/command/5686.md +++ b/test/command/5686.md @@ -4,6 +4,28 @@ FOO\t0BAR This part does not make it to the html output. ^D -[Para [Str "FOO",RawInline (Format "tex") "\\t0",Str "BAR"] -,Para [Str "This",Space,Str "part",Space,Str "does",Space,Str "not",Space,Str "make",Space,Str "it",Space,Str "to",Space,Str "the",Space,Str "html",Space,Str "output."]] +[ Para + [ Str "FOO", RawInline ( Format "tex" ) "\\t0", Str "BAR" ] +, Para + [ Str "This" + , Space + , Str "part" + , Space + , Str "does" + , Space + , Str "not" + , Space + , Str "make" + , Space + , Str "it" + , Space + , Str "to" + , Space + , Str "the" + , Space + , Str "html" + , Space + , Str "output." + ] +] ``` diff --git a/test/command/5700.md b/test/command/5700.md index 64f99c862..ca8ab19fd 100644 --- a/test/command/5700.md +++ b/test/command/5700.md @@ -1,6 +1,40 @@ ``` % pandoc -t native -s --metadata-file command/5700-metadata-file-1.yml --metadata-file command/5700-metadata-file-2.yml ^D -Pandoc (Meta {unMeta = fromList [("desc",MetaInlines [Str "Both",Space,Str "of",Space,Str "these",Space,Str "files",Space,Str "should",Space,Str "be",Space,Str "loaded."]),("title",MetaInlines [Str "Multiple",Space,Str "metadata",Space,Str "files",Space,Str "test"])]}) -[] +Pandoc + ( Meta + { unMeta = fromList + [ + ( "desc" + , MetaInlines + [ Str "Both" + , Space + , Str "of" + , Space + , Str "these" + , Space + , Str "files" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "loaded." + ] + ) + , + ( "title" + , MetaInlines + [ Str "Multiple" + , Space + , Str "metadata" + , Space + , Str "files" + , Space + , Str "test" + ] + ) + ] + } + ) [] ``` diff --git a/test/command/5708.md b/test/command/5708.md index e5ba72c69..bb471a734 100644 --- a/test/command/5708.md +++ b/test/command/5708.md @@ -4,19 +4,33 @@ | 123456 | :math:`a + b` | +--------+----------------+ ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidth 0.125) - ,(AlignDefault,ColWidth 0.2361111111111111)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "123456"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Math InlineMath "a + b"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignDefault, ColWidth 0.125 ) + , + ( AlignDefault, ColWidth 0.2361111111111111 ) + ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "123456" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Math InlineMath "a + b" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/5711.md b/test/command/5711.md index 5758138f9..b7039dc91 100644 --- a/test/command/5711.md +++ b/test/command/5711.md @@ -7,16 +7,24 @@ \end{tabular} \end{document} ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignCenter,ColWidthDefault)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "d",LineBreak,Str "e"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ ( AlignCenter, ColWidthDefault ) ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "d", LineBreak, Str "e" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/5714.md b/test/command/5714.md index 48e25c1a2..a38ec2384 100644 --- a/test/command/5714.md +++ b/test/command/5714.md @@ -6,8 +6,15 @@ b_ # hi _c c ^D -[Header 1 ("hi-_a",[],[]) [Str "hi",Space,Str "_a"] -,Para [Str "b_"] -,Header 1 ("hi-_c",[],[]) [Str "hi",Space,Str "_c"] -,Para [Str "c"]] +[ Header 1 + ( "hi-_a", [], [] ) + [ Str "hi", Space, Str "_a" ] +, Para + [ Str "b_" ] +, Header 1 + ( "hi-_c", [], [] ) + [ Str "hi", Space, Str "_c" ] +, Para + [ Str "c" ] +] ``` diff --git a/test/command/5753.md b/test/command/5753.md index 6e761e4f6..d40eb8a41 100644 --- a/test/command/5753.md +++ b/test/command/5753.md @@ -10,6 +10,9 @@ end ^D -[Para [Math DisplayMath "q_3\n+ 4",Math DisplayMath "- 5 +\nq_5"] -,Para [Str "end"]] +[ Para + [ Math DisplayMath "q_3\n+ 4", Math DisplayMath "- 5 +\nq_5" ] +, Para + [ Str "end" ] +] ``` diff --git a/test/command/5795.md b/test/command/5795.md index 0d5154b4d..d62588d6d 100644 --- a/test/command/5795.md +++ b/test/command/5795.md @@ -9,7 +9,12 @@ % pandoc -f html -t native <dfn class="dfn" id="foo" title="bax"><span>foo</span></dfn> ^D -[Plain [Span ("foo",["dfn","dfn"],[("title","bax")]) [Span ("",[],[]) [Str "foo"]]]] +[ Plain + [ Span + ( "foo", [ "dfn", "dfn" ], [ ( "title", "bax" ) ] ) + [ Span ( "", [], [] ) [ Str "foo" ] ] + ] +] ``` ``` diff --git a/test/command/5797.md b/test/command/5797.md index 0509a341c..c85c76aaf 100644 --- a/test/command/5797.md +++ b/test/command/5797.md @@ -9,7 +9,7 @@ % pandoc -f html -t native <mark>Ctrl-C</mark> ^D -[Plain [Span ("",["mark"],[]) [Str "Ctrl-C"]]] +[ Plain [ Span ( "", [ "mark" ], [] ) [ Str "Ctrl-C" ] ] ] ``` ``` diff --git a/test/command/5805.md b/test/command/5805.md index 8bfc75f2d..f08dca96b 100644 --- a/test/command/5805.md +++ b/test/command/5805.md @@ -9,7 +9,7 @@ % pandoc -f html -t native <kbd>Ctrl-C</kbd> ^D -[Plain [Span ("",["kbd"],[]) [Str "Ctrl-C"]]] +[ Plain [ Span ( "", [ "kbd" ], [] ) [ Str "Ctrl-C" ] ] ] ``` ``` diff --git a/test/command/5845.md b/test/command/5845.md index aa09b08e7..d551740b1 100644 --- a/test/command/5845.md +++ b/test/command/5845.md @@ -2,7 +2,7 @@ % pandoc -t native \parbox{1em}{#1} ^D -[Para [Str "\\parbox{1em}{#1}"]] +[ Para [ Str "\\parbox{1em}{#1}" ] ] ``` ``` @@ -11,6 +11,20 @@ Hello World ^D -[Para [Str "\\newcommand{",RawInline (Format "tex") "\\highlight",Str "}[1]{\\colorbox{yellow}{\\parbox{",RawInline (Format "tex") "\\dimexpr",RawInline (Format "tex") "\\linewidth-2",RawInline (Format "tex") "\\fboxsep",Str "}{#1}}"] -,Para [Str "Hello",Space,Str "World"]] +[ Para + [ Str "\\newcommand{" + , RawInline + ( Format "tex" ) "\\highlight" + , Str "}[1]{\\colorbox{yellow}{\\parbox{" + , RawInline + ( Format "tex" ) "\\dimexpr" + , RawInline + ( Format "tex" ) "\\linewidth-2" + , RawInline + ( Format "tex" ) "\\fboxsep" + , Str "}{#1}}" + ] +, Para + [ Str "Hello", Space, Str "World" ] +] ``` diff --git a/test/command/5878.md b/test/command/5878.md index 9e0f6bde3..f3259d8fa 100644 --- a/test/command/5878.md +++ b/test/command/5878.md @@ -3,5 +3,15 @@ Zozime^[], Synésius^[] ^D -[Para [Str "Zozime",Note [Para []],Str ",",SoftBreak,Str "Syn\233sius",Note [Para []]]] +[ Para + [ Str "Zozime" + , Note + [ Para [] ] + , Str "," + , SoftBreak + , Str "Syn\233sius" + , Note + [ Para [] ] + ] +] ``` diff --git a/test/command/6009.md b/test/command/6009.md index ed6b46cbb..c3000af47 100644 --- a/test/command/6009.md +++ b/test/command/6009.md @@ -9,10 +9,17 @@ x y ^D -[RawBlock (Format "html") "<tr>" -,RawBlock (Format "html") "<td>" -,RawBlock (Format "html") "</td>" -,RawBlock (Format "html") "</tr>" -,Para [Str "x"] -,CodeBlock ("",[],[]) "y"] +[ RawBlock + ( Format "html" ) "<tr>" +, RawBlock + ( Format "html" ) "<td>" +, RawBlock + ( Format "html" ) "</td>" +, RawBlock + ( Format "html" ) "</tr>" +, Para + [ Str "x" ] +, CodeBlock + ( "", [], [] ) "y" +] ``` diff --git a/test/command/6026.md b/test/command/6026.md index 5e18a5f42..f900a5295 100644 --- a/test/command/6026.md +++ b/test/command/6026.md @@ -4,8 +4,34 @@ @https://openreview.net/forum?id=HkwoSDPgg ^D -[Para [Cite [Citation {citationId = "https://openreview.net/forum?id=HkwoSDPgg", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 1, citationHash = 0}] [Str "@https://openreview.net/forum?id=HkwoSDPgg"]] -,Para [Cite [Citation {citationId = "https://openreview.net/forum?id", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 2, citationHash = 0}] [Str "@https://openreview.net/forum?id"],Str "=HkwoSDPgg"]] +[ Para + [ Cite + [ Citation + { citationId = "https://openreview.net/forum?id=HkwoSDPgg" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "@https://openreview.net/forum?id=HkwoSDPgg" ] + ] +, Para + [ Cite + [ Citation + { citationId = "https://openreview.net/forum?id" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 2 + , citationHash = 0 + } + ] + [ Str "@https://openreview.net/forum?id" ] + , Str "=HkwoSDPgg" + ] +] ``` ``` % pandoc -t markdown diff --git a/test/command/6034.md b/test/command/6034.md index af41f2d50..3abf85455 100644 --- a/test/command/6034.md +++ b/test/command/6034.md @@ -7,5 +7,7 @@ \end{overpic} \end{figure*} ^D -[RawBlock (Format "latex") "\\begin{figure*}\n \\centering\n \\begin{overpic}{test_pic}\n \\put (70,80) {Caption}\n \\end{overpic}\n\\end{figure*}"] +[ RawBlock + ( Format "latex" ) "\\begin{figure*}\n \\centering\n \\begin{overpic}{test_pic}\n \\put (70,80) {Caption}\n \\end{overpic}\n\\end{figure*}" +] ``` diff --git a/test/command/6114.md b/test/command/6114.md index e0f2d675b..9af798b6b 100644 --- a/test/command/6114.md +++ b/test/command/6114.md @@ -3,5 +3,11 @@ \includegraphics[width=.85\textwidth]% {pic_M87star.pdf} ^D -[Para [Image ("",[],[("width",".85\\textwidth")]) [Str "image"] ("pic_M87star.pdf","")]] +[ Para + [ Image + ( "", [], [ ( "width", ".85\\textwidth" ) ] ) + [ Str "image" ] + ( "pic_M87star.pdf", "" ) + ] +] ``` diff --git a/test/command/6137.md b/test/command/6137.md index 9081f775f..d6cd34b92 100644 --- a/test/command/6137.md +++ b/test/command/6137.md @@ -15,33 +15,137 @@ This reference to Figure \ref{fig:label} works fine. \caption{A numbered caption, if I use pandoc-crossref.}\label{fig:label} \end{figure} ^D -[Para [Str "This",Space,Str "reference",Space,Str "to",Space,Str "Table",Space,Link ("",[],[("reference-type","ref"),("reference","tbl:label")]) [Str "1"] ("#tbl:label",""),Space,Str "doesn\8217t",Space,Str "work."] -,Div ("tbl:label",[],[]) - [Table ("",[],[]) (Caption Nothing - [Plain [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."]]) - [(AlignLeft,ColWidthDefault) - ,(AlignCenter,ColWidthDefault) - ,(AlignRight,ColWidthDefault)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "\8212\8212\8211"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "\8212\8212\8211"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "\8212\8212\8211"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "\8212\8212\8211"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "\8212\8212\8211"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "\8212\8212\8211"]]]])] - (TableFoot ("",[],[]) - [])] -,Para [Str "This",Space,Str "reference",Space,Str "to",Space,Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:label")]) [Str "1"] ("#fig:label",""),Space,Str "works",Space,Str "fine."] -,Para [Image ("fig:label",[],[("width","\\textwidth")]) [Str "A",Space,Str "numbered",Space,Str "caption,",Space,Str "if",Space,Str "I",Space,Str "use",Space,Str "pandoc-crossref."] ("example.png","fig:")]] +[ Para + [ Str "This" + , Space + , Str "reference" + , Space + , Str "to" + , Space + , Str "Table" + , Space + , Link + ( "" + , [] + , + [ ( "reference-type", "ref" ), ( "reference", "tbl:label" ) ] + ) + [ Str "1" ] + ( "#tbl:label", "" ) + , Space + , Str "doesn\8217t" + , Space + , Str "work." + ] +, Div + ( "tbl:label", [], [] ) + [ Table + ( "", [], [] ) + ( Caption Nothing + [ Plain + [ Str "This" + , Space + , Str "caption" + , Space + , Str "has" + , Space + , Str "no" + , Space + , Str "number." + ] + ] + ) + [ + ( AlignLeft, ColWidthDefault ) + , + ( AlignCenter, ColWidthDefault ) + , + ( AlignRight, ColWidthDefault ) + ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "\8212\8212\8211" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "\8212\8212\8211" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "\8212\8212\8211" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "\8212\8212\8211" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "\8212\8212\8211" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "\8212\8212\8211" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) + ] +, Para + [ Str "This" + , Space + , Str "reference" + , Space + , Str "to" + , Space + , Str "Figure" + , Space + , Link + ( "" + , [] + , + [ ( "reference-type", "ref" ), ( "reference", "fig:label" ) ] + ) + [ Str "1" ] + ( "#fig:label", "" ) + , Space + , Str "works" + , Space + , Str "fine." + ] +, Para + [ Image + ( "fig:label", [], [ ( "width", "\\textwidth" ) ] ) + [ Str "A" + , Space + , Str "numbered" + , Space + , Str "caption," + , Space + , Str "if" + , Space + , Str "I" + , Space + , Str "use" + , Space + , Str "pandoc-crossref." + ] + ( "example.png", "fig:" ) + ] +] ``` diff --git a/test/command/6288.md b/test/command/6288.md index 29aff0fb9..5314499e0 100644 --- a/test/command/6288.md +++ b/test/command/6288.md @@ -4,5 +4,5 @@ <label>I</label><title>Introduction</title> </sec> ^D -[Header 1 ("",[],[]) [Str "I.",Space,Str "Introduction"]] +[ Header 1 ( "", [], [] ) [ Str "I.", Space, Str "Introduction" ] ] ``` diff --git a/test/command/6324.md b/test/command/6324.md index 0fe57ce65..758312766 100644 --- a/test/command/6324.md +++ b/test/command/6324.md @@ -12,6 +12,14 @@ Me \maketitle \end{document} ^D -Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "Me"]]),("title",MetaInlines [Str "Document",Space,Str "title"])]}) -[] +Pandoc + ( Meta + { unMeta = fromList + [ + ( "author", MetaList [ MetaInlines [ Str "Me" ] ] ) + , + ( "title", MetaInlines [ Str "Document", Space, Str "title" ] ) + ] + } + ) [] ``` diff --git a/test/command/6699.md b/test/command/6699.md index 347e04577..3f0f129e4 100644 --- a/test/command/6699.md +++ b/test/command/6699.md @@ -7,7 +7,11 @@ title text ^D -[Header 1 ("title",["allowframebreaks"],[]) [Str "title"] -,Para [Str "text"]] +[ Header 1 + ( "title", [ "allowframebreaks" ], [] ) + [ Str "title" ] +, Para + [ Str "text" ] +] ``` diff --git a/test/command/6709.md b/test/command/6709.md index d6d514552..7ed5225ab 100644 --- a/test/command/6709.md +++ b/test/command/6709.md @@ -7,5 +7,5 @@ if true; then fi ``` ^D -[CodeBlock ("",[],[]) "if true; then\n echo \"yup\"\nfi"] +[ CodeBlock ( "", [], [] ) "if true; then\n echo \"yup\"\nfi" ] ```` diff --git a/test/command/6719.md b/test/command/6719.md index 788e7b617..1f9e29cf5 100644 --- a/test/command/6719.md +++ b/test/command/6719.md @@ -4,7 +4,7 @@ <emphasis>emphasized </emphasis>text </para> ^D -[Para [Emph [Str "emphasized"],Space,Str "text"]] +[ Para [ Emph [ Str "emphasized" ], Space, Str "text" ] ] ``` ``` @@ -13,6 +13,6 @@ <italic> hi </italic>there </p> ^D -[Para [Emph [Str "hi"],Space,Str "there"]] +[ Para [ Emph [ Str "hi" ], Space, Str "there" ] ] ``` diff --git a/test/command/6791.md b/test/command/6791.md index 478647721..a515007a1 100644 --- a/test/command/6791.md +++ b/test/command/6791.md @@ -14,19 +14,29 @@ </tgroup> </informaltable> ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidth 0.25) - ,(AlignDefault,ColWidth 0.25)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "2"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "1"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ ( AlignDefault, ColWidth 0.25 ), ( AlignDefault, ColWidth 0.25 ) ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "2" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "1" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/6802.md b/test/command/6802.md index 8f56f0e43..342d173a6 100644 --- a/test/command/6802.md +++ b/test/command/6802.md @@ -2,8 +2,6 @@ % pandoc -f latex -t native \blockquote[test][]{quote} ^D -[BlockQuote - [Para [Str "quote"] - ,Para [Str "test"]]] +[ BlockQuote [ Para [ Str "quote" ], Para [ Str "test" ] ] ] ``` diff --git a/test/command/6836.md b/test/command/6836.md index 733318b69..8c89ee0d2 100644 --- a/test/command/6836.md +++ b/test/command/6836.md @@ -8,10 +8,36 @@ See @foo. [@buchanan] ^D -[Para [Cite [Citation {citationId = "buchanan", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 1, citationHash = 0}] [Str "[@buchanan]"]] -,OrderedList (1,Example,TwoParens) - [[]] -,Para [Str "See",Space,Str "1."] -,Para [Cite [Citation {citationId = "buchanan", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 2, citationHash = 0}] [Str "[@buchanan]"]]] +[ Para + [ Cite + [ Citation + { citationId = "buchanan" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "[@buchanan]" ] + ] +, OrderedList + ( 1, Example, TwoParens ) [ [] ] +, Para + [ Str "See", Space, Str "1." ] +, Para + [ Cite + [ Citation + { citationId = "buchanan" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 2 + , citationHash = 0 + } + ] + [ Str "[@buchanan]" ] + ] +] ``` diff --git a/test/command/6844.md b/test/command/6844.md index 0431cfed8..e7af336a3 100644 --- a/test/command/6844.md +++ b/test/command/6844.md @@ -5,7 +5,7 @@ Negative numbers with siunitx \SI{123}{\celsius} ^D -[Para [Str "123\160\176C"]] +[ Para [ Str "123\160\176C" ] ] ``` ``` @@ -13,7 +13,7 @@ Negative numbers with siunitx \SI{-123}{\celsius} ^D -[Para [Str "\8722\&123\160\176C"]] +[ Para [ Str "\8722\&123\160\176C" ] ] ``` ``` @@ -21,7 +21,7 @@ Negative numbers with siunitx \SI{+123}{\celsius} ^D -[Para [Str "123\160\176C"]] +[ Para [ Str "123\160\176C" ] ] ``` diff --git a/test/command/6869.md b/test/command/6869.md index cd8ff9ff4..6e195e944 100644 --- a/test/command/6869.md +++ b/test/command/6869.md @@ -2,5 +2,19 @@ % pandoc -f latex -t native \cite[„Aber“]{key} ^D -[Para [Cite [Citation {citationId = "key", citationPrefix = [], citationSuffix = [Str "\8222Aber\8220"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [RawInline (Format "latex") "\\cite[\8222Aber\8220]{key}"]]] +[ Para + [ Cite + [ Citation + { citationId = "key" + , citationPrefix = [] + , citationSuffix = + [ Str "\8222Aber\8220" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline ( Format "latex" ) "\\cite[\8222Aber\8220]{key}" ] + ] +] ``` diff --git a/test/command/6873.md b/test/command/6873.md index d747a47ff..f2d47b5ad 100644 --- a/test/command/6873.md +++ b/test/command/6873.md @@ -3,5 +3,38 @@ \cite[„Etwas […{]} auslassen“]{key} ^D [WARNING] Citeproc: citation key not found -[Para [Cite [Citation {citationId = "key", citationPrefix = [], citationSuffix = [Str "\8222Etwas",Space,Str "[\8230",Span ("",[],[]) [Str "]"],Space,Str "auslassen\8220"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "(",Strong [Str "key?"],Str "\8222Etwas",Space,Str "[\8230",Span ("",[],[]) [Str "]"],Space,Str "auslassen\8220)"]]] +[ Para + [ Cite + [ Citation + { citationId = "key" + , citationPrefix = [] + , citationSuffix = + [ Str "\8222Etwas" + , Space + , Str "[\8230" + , Span + ( "", [], [] ) + [ Str "]" ] + , Space + , Str "auslassen\8220" + ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ Str "(" + , Strong + [ Str "key?" ] + , Str "\8222Etwas" + , Space + , Str "[\8230" + , Span + ( "", [], [] ) + [ Str "]" ] + , Space + , Str "auslassen\8220)" + ] + ] +] ``` diff --git a/test/command/6890.md b/test/command/6890.md index e36c12771..71f53bb13 100644 --- a/test/command/6890.md +++ b/test/command/6890.md @@ -27,10 +27,113 @@ Some text.[^1] [^1]: @fruchtel-sozialer-2013a ^D -[Para [Cite [Citation {citationId = "fruchtel-sozialer-2013a", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 1, citationHash = 0}] [Str "Fr\252chtel,",Space,Str "Budde,",Space,Str "and",Space,Str "Cyprian",Space,Str "(2013)"]] -,Para [Str "Some",Space,Str "text.",Note [Para [Cite [Citation {citationId = "fruchtel-sozialer-2013a", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 2, citationHash = 0}] [Str "Fr\252chtel,",Space,Str "Budde,",Space,Str "and",Space,Str "Cyprian",Space,Str "(2013)"]]]] -,Div ("refs",["references","csl-bib-body","hanging-indent"],[]) - [Div ("ref-fruchtel-sozialer-2013a",["csl-entry"],[]) - [Para [Str "Fr\252chtel,",Space,Str "Frank,",Space,Str "Wolfgang",Space,Str "Budde,",Space,Str "and",Space,Str "Gudrun",Space,Str "Cyprian.",Space,Str "2013.",Space,Emph [Str "Sozialer",Space,Str "Raum",Space,Str "und",Space,Str "Soziale",Space,Str "Arbeit",Space,Str "Fieldbook:",Space,Str "Methoden",Space,Str "und",Space,Str "Techniken"],Str ".",Space,Str "3rd",Space,Str "ed.",Space,Str "Wiesbaden,",Space,Str "Germany:",Space,Str "Springer",Space,Str "VS."]]]] +[ Para + [ Cite + [ Citation + { citationId = "fruchtel-sozialer-2013a" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "Fr\252chtel," + , Space + , Str "Budde," + , Space + , Str "and" + , Space + , Str "Cyprian" + , Space + , Str "(2013)" + ] + ] +, Para + [ Str "Some" + , Space + , Str "text." + , Note + [ Para + [ Cite + [ Citation + { citationId = "fruchtel-sozialer-2013a" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 2 + , citationHash = 0 + } + ] + [ Str "Fr\252chtel," + , Space + , Str "Budde," + , Space + , Str "and" + , Space + , Str "Cyprian" + , Space + , Str "(2013)" + ] + ] + ] + ] +, Div + ( "refs", [ "references", "csl-bib-body", "hanging-indent" ], [] ) + [ Div + ( "ref-fruchtel-sozialer-2013a", [ "csl-entry" ], [] ) + [ Para + [ Str "Fr\252chtel," + , Space + , Str "Frank," + , Space + , Str "Wolfgang" + , Space + , Str "Budde," + , Space + , Str "and" + , Space + , Str "Gudrun" + , Space + , Str "Cyprian." + , Space + , Str "2013." + , Space + , Emph + [ Str "Sozialer" + , Space + , Str "Raum" + , Space + , Str "und" + , Space + , Str "Soziale" + , Space + , Str "Arbeit" + , Space + , Str "Fieldbook:" + , Space + , Str "Methoden" + , Space + , Str "und" + , Space + , Str "Techniken" + ] + , Str "." + , Space + , Str "3rd" + , Space + , Str "ed." + , Space + , Str "Wiesbaden," + , Space + , Str "Germany:" + , Space + , Str "Springer" + , Space + , Str "VS." + ] + ] + ] +] ``` diff --git a/test/command/6993.md b/test/command/6993.md index b7f7f5384..17a7056e2 100644 --- a/test/command/6993.md +++ b/test/command/6993.md @@ -2,20 +2,20 @@ % pandoc -f mediawiki -t native '''Should be bold ''' ^D -[Para [Strong [Str "Should",Space,Str "be",Space,Str "bold"]]] +[ Para [ Strong [ Str "Should", Space, Str "be", Space, Str "bold" ] ] ] ``` ``` % pandoc -f mediawiki -t native ''' Should be bold''' ^D -[Para [Strong [Str "Should",Space,Str "be",Space,Str "bold"]]] +[ Para [ Strong [ Str "Should", Space, Str "be", Space, Str "bold" ] ] ] ``` ``` % pandoc -f mediawiki -t native '' Should be emph '' ^D -[Para [Emph [Str "Should",Space,Str "be",Space,Str "emph"]]] +[ Para [ Emph [ Str "Should", Space, Str "be", Space, Str "emph" ] ] ] ``` diff --git a/test/command/7003.md b/test/command/7003.md index 1f6275943..4f5e18c70 100644 --- a/test/command/7003.md +++ b/test/command/7003.md @@ -30,8 +30,21 @@ This a Foo section \lstinputlisting{example.tex} \end{document} ^D -[Header 1 ("with-lstlisting-environment",[],[]) [Str "With",Space,Str "lstlisting",Space,Str "environment"] -,CodeBlock ("",[],[]) "\\documentclass{article}\n\\begin{document}\n\\section{Foo}\nThis a Foo section\n\\end{document}" -,Header 1 ("with-lstinputlisting-command",[],[]) [Str "With",Space,Str "lstinputlisting",Space,Str "command"] -,CodeBlock ("",["latex"],[]) "\\documentclass{article}\n\\begin{document}\n\\section{Bar}\nThis a Bar section\n\\end{document}"] +[ Header 1 + ( "with-lstlisting-environment", [], [] ) + [ Str "With", Space, Str "lstlisting", Space, Str "environment" ] +, CodeBlock + ( "" + , [] + , [] + ) "\\documentclass{article}\n\\begin{document}\n\\section{Foo}\nThis a Foo section\n\\end{document}" +, Header 1 + ( "with-lstinputlisting-command", [], [] ) + [ Str "With", Space, Str "lstinputlisting", Space, Str "command" ] +, CodeBlock + ( "" + , [ "latex" ] + , [] + ) "\\documentclass{article}\n\\begin{document}\n\\section{Bar}\nThis a Bar section\n\\end{document}" +] ``` diff --git a/test/command/7080.md b/test/command/7080.md index 0727c1083..3f17c6d46 100644 --- a/test/command/7080.md +++ b/test/command/7080.md @@ -4,5 +4,10 @@ [image]: image.png width=100px height=150px ^D -[Para [Image ("",[],[("width","100px"),("height","150px")]) [] ("image.png","")]] +[ Para + [ Image + ( "", [], [ ( "width", "100px" ), ( "height", "150px" ) ] ) [] + ( "image.png", "" ) + ] +] ``` diff --git a/test/command/7092.md b/test/command/7092.md index e7f127244..0c1d1ae8c 100644 --- a/test/command/7092.md +++ b/test/command/7092.md @@ -4,5 +4,5 @@ \em{\parseMe{foo}} ^D -[Para [Emph [RawInline (Format "latex") "\\parseMe{foo}"]]] +[ Para [ Emph [ RawInline ( Format "latex" ) "\\parseMe{foo}" ] ] ] ``` diff --git a/test/command/7129.md b/test/command/7129.md index fef4ca2c3..caabc99a3 100644 --- a/test/command/7129.md +++ b/test/command/7129.md @@ -5,23 +5,45 @@ foo & \verb|b&r| \\ \hline \end{tabular} ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignLeft,ColWidthDefault) - ,(AlignLeft,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "FOO"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "BAR"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "foo"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Code ("",[],[]) "b&r"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ ( AlignLeft, ColWidthDefault ), ( AlignLeft, ColWidthDefault ) ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "FOO" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "BAR" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "foo" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Code ( "", [], [] ) "b&r" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/7134.md b/test/command/7134.md index c69ae4bd0..24980fabb 100644 --- a/test/command/7134.md +++ b/test/command/7134.md @@ -8,9 +8,44 @@ This is a paragraph. This should be a second block quote. ^D -[Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "paragraph."] -,BlockQuote - [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote."]] -,BlockQuote - [Para [Str "This",Space,Str "should",Space,Str "be",Space,Str "a",Space,Str "second",Space,Str "block",Space,Str "quote."]]] +[ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "paragraph." + ] +, BlockQuote + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "block" + , Space + , Str "quote." + ] + ] +, BlockQuote + [ Para + [ Str "This" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "a" + , Space + , Str "second" + , Space + , Str "block" + , Space + , Str "quote." + ] + ] +] ``` diff --git a/test/command/7145.md b/test/command/7145.md index a04345890..21310ccdf 100644 --- a/test/command/7145.md +++ b/test/command/7145.md @@ -8,5 +8,68 @@ empty linebreaks</ref> Nulla ut massa eget ex venenatis lobortis id in eros. ^D -[Para [Str "Maecenas",Space,Str "at",Space,Str "sapien",Space,Str "tempor,",Space,Str "pretium",Space,Str "turpis",Space,Str "ut,",Space,Str "imperdiet",Space,Str "augue.",Note [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "multiline"],Para [Str "reference",SoftBreak,RawInline (Format "html") "<i>",Str "with",RawInline (Format "html") "</i>",SoftBreak,Str "empty"],Para [Str "linebreaks"]],Space,Str "Nulla",Space,Str "ut",Space,Str "massa",Space,Str "eget",Space,Str "ex",Space,Str "venenatis",Space,Str "lobortis",Space,Str "id",Space,Str "in",Space,Str "eros."]] +[ Para + [ Str "Maecenas" + , Space + , Str "at" + , Space + , Str "sapien" + , Space + , Str "tempor," + , Space + , Str "pretium" + , Space + , Str "turpis" + , Space + , Str "ut," + , Space + , Str "imperdiet" + , Space + , Str "augue." + , Note + [ Para + [ Str "This" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "multiline" + ] + , Para + [ Str "reference" + , SoftBreak + , RawInline + ( Format "html" ) "<i>" + , Str "with" + , RawInline + ( Format "html" ) "</i>" + , SoftBreak + , Str "empty" + ] + , Para + [ Str "linebreaks" ] + ] + , Space + , Str "Nulla" + , Space + , Str "ut" + , Space + , Str "massa" + , Space + , Str "eget" + , Space + , Str "ex" + , Space + , Str "venenatis" + , Space + , Str "lobortis" + , Space + , Str "id" + , Space + , Str "in" + , Space + , Str "eros." + ] +] ``` diff --git a/test/command/7155.md b/test/command/7155.md index 49358bf97..5e26e4469 100644 --- a/test/command/7155.md +++ b/test/command/7155.md @@ -3,7 +3,16 @@ \(x\) \[x\] \\(x\\) \\[x\\] ^D -[Para [Math InlineMath "x",Space,Math DisplayMath "x",SoftBreak,Str "\\(x\\)",Space,Str "\\[x\\]"]] +[ Para + [ Math InlineMath "x" + , Space + , Math DisplayMath "x" + , SoftBreak + , Str "\\(x\\)" + , Space + , Str "\\[x\\]" + ] +] ``` ``` @@ -11,5 +20,14 @@ \(x\) \[x\] \\(x\\) \\[x\\] ^D -[Para [Str "(x)",Space,Str "[x]",SoftBreak,Math InlineMath "x",Space,Math DisplayMath "x"]] +[ Para + [ Str "(x)" + , Space + , Str "[x]" + , SoftBreak + , Math InlineMath "x" + , Space + , Math DisplayMath "x" + ] +] ``` diff --git a/test/command/7339.md b/test/command/7339.md index 9697c1c32..31bfc7f1c 100644 --- a/test/command/7339.md +++ b/test/command/7339.md @@ -6,6 +6,9 @@ title: Test Hi ^D -Pandoc (Meta {unMeta = fromList [("title",MetaInlines [Str "Test"])]}) -[Para [Str "Hi"]] +Pandoc + ( Meta + { unMeta = fromList [ ( "title", MetaInlines [ Str "Test" ] ) ] } + ) + [ Para [ Str "Hi" ] ] ``` diff --git a/test/command/7340.md b/test/command/7340.md index 25decd732..2c080a439 100644 --- a/test/command/7340.md +++ b/test/command/7340.md @@ -2,5 +2,5 @@ % pandoc -f latex -t native \(*\) ^D -[Para [Math InlineMath "*"]] +[ Para [ Math InlineMath "*" ] ] ``` diff --git a/test/command/7400.md b/test/command/7400.md index d4be32d72..d93c203b2 100644 --- a/test/command/7400.md +++ b/test/command/7400.md @@ -4,6 +4,6 @@ # Comment only ... ^D -Pandoc (Meta {unMeta = fromList []}) -[] +Pandoc + ( Meta { unMeta = fromList [] } ) [] ``` diff --git a/test/command/7434.md b/test/command/7434.md index be8732bc2..61740f8fe 100644 --- a/test/command/7434.md +++ b/test/command/7434.md @@ -9,7 +9,15 @@ [\*\a](x) ^D -[RawBlock (Format "tex") "\\begin{proof}\n\\newcommand{\\x}{\\left.\\right.}\n\\left.\\right.\n\\end{proof}" -,Para [Str "1234567890abcdefghi"] -,Para [Link ("",[],[]) [Str "*",RawInline (Format "tex") "\\a"] ("x","")]] +[ RawBlock + ( Format "tex" ) "\\begin{proof}\n\\newcommand{\\x}{\\left.\\right.}\n\\left.\\right.\n\\end{proof}" +, Para + [ Str "1234567890abcdefghi" ] +, Para + [ Link + ( "", [], [] ) + [ Str "*", RawInline ( Format "tex" ) "\\a" ] + ( "x", "" ) + ] +] ``` diff --git a/test/command/7436.md b/test/command/7436.md index fd6e51aa8..3e1829ca8 100644 --- a/test/command/7436.md +++ b/test/command/7436.md @@ -8,7 +8,26 @@ .. include:: command/three.txt ^D -[CodeBlock ("",[""],[("code","")]) "1st line.\n2nd line.\n3rd line.\n" -,CodeBlock ("",[""],[("literal","")]) "1st line.\n2nd line.\n3rd line.\n" -,Para [Str "1st",Space,Str "line.",SoftBreak,Str "2nd",Space,Str "line.",SoftBreak,Str "3rd",Space,Str "line."]] +[ CodeBlock + ( "", [ "" ], [ ( "code", "" ) ] ) "1st line.\n2nd line.\n3rd line.\n" +, CodeBlock + ( "" + , [ "" ] + , + [ ( "literal", "" ) ] + ) "1st line.\n2nd line.\n3rd line.\n" +, Para + [ Str "1st" + , Space + , Str "line." + , SoftBreak + , Str "2nd" + , Space + , Str "line." + , SoftBreak + , Str "3rd" + , Space + , Str "line." + ] +] ``` diff --git a/test/command/7557.md b/test/command/7557.md index 26e2df740..910761c7e 100644 --- a/test/command/7557.md +++ b/test/command/7557.md @@ -2,6 +2,20 @@ % pandoc -f org -t native - 11. and 12. 09. meeting ^D -[BulletList - [[Plain [Str "11.",Space,Str "and",Space,Str "12.",Space,Str "09.",Space,Str "meeting"]]]] +[ BulletList + [ + [ Plain + [ Str "11." + , Space + , Str "and" + , Space + , Str "12." + , Space + , Str "09." + , Space + , Str "meeting" + ] + ] + ] +] ``` diff --git a/test/command/934.md b/test/command/934.md index ef99abdf9..195d5602e 100644 --- a/test/command/934.md +++ b/test/command/934.md @@ -7,6 +7,37 @@ } \ddb{This should be italic and in quotes}{And this is the attribution} ^D -[Para [Emph [Quoted DoubleQuote [Str "This",Space,Str "should",Space,Str "be",Space,Str "italic",Space,Str "and",Space,Str "in",Space,Str "quotes"]]] -,Para [Strong [Str "And",Space,Str "this",Space,Str "is",Space,Str "the",Space,Str "attribution"]]] +[ Para + [ Emph + [ Quoted DoubleQuote + [ Str "This" + , Space + , Str "should" + , Space + , Str "be" + , Space + , Str "italic" + , Space + , Str "and" + , Space + , Str "in" + , Space + , Str "quotes" + ] + ] + ] +, Para + [ Strong + [ Str "And" + , Space + , Str "this" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "attribution" + ] + ] +] ``` diff --git a/test/command/982.md b/test/command/982.md index 5f54f7713..4b997c4c4 100644 --- a/test/command/982.md +++ b/test/command/982.md @@ -7,5 +7,5 @@ y=x^2 \EEQ ^D -[Para [Math DisplayMath "y=x^2"]] +[ Para [ Math DisplayMath "y=x^2" ] ] ``` diff --git a/test/command/adjacent_latex_blocks.md b/test/command/adjacent_latex_blocks.md index e7dc6d895..3d3334424 100644 --- a/test/command/adjacent_latex_blocks.md +++ b/test/command/adjacent_latex_blocks.md @@ -4,6 +4,9 @@ \listoftables ^D -[RawBlock (Format "tex") "\\listoffigures" -,RawBlock (Format "tex") "\\listoftables"] +[ RawBlock + ( Format "tex" ) "\\listoffigures" +, RawBlock + ( Format "tex" ) "\\listoftables" +] ``` diff --git a/test/command/cite-in-inline-note.md b/test/command/cite-in-inline-note.md index 962eddd2a..409e389b9 100644 --- a/test/command/cite-in-inline-note.md +++ b/test/command/cite-in-inline-note.md @@ -2,5 +2,25 @@ % pandoc -t native foo^[bar [@doe]] ^D -[Para [Str "foo",Note [Para [Str "bar",Space,Cite [Citation {citationId = "doe", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 1, citationHash = 0}] [Str "[@doe]"]]]]] +[ Para + [ Str "foo" + , Note + [ Para + [ Str "bar" + , Space + , Cite + [ Citation + { citationId = "doe" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "[@doe]" ] + ] + ] + ] +] ``` diff --git a/test/command/citeproc-author-in-text-suffix.md b/test/command/citeproc-author-in-text-suffix.md index b55502053..4e511fd1b 100644 --- a/test/command/citeproc-author-in-text-suffix.md +++ b/test/command/citeproc-author-in-text-suffix.md @@ -2,5 +2,27 @@ % pandoc -t native @a [p. 33; @b] ^D -[Para [Cite [Citation {citationId = "a", citationPrefix = [], citationSuffix = [Str "p.\160\&33"], citationMode = AuthorInText, citationNoteNum = 1, citationHash = 0},Citation {citationId = "b", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 1, citationHash = 0}] [Str "@a",Space,Str "[p.",Space,Str "33;",Space,Str "@b]"]]] +[ Para + [ Cite + [ Citation + { citationId = "a" + , citationPrefix = [] + , citationSuffix = + [ Str "p.\160\&33" ] + , citationMode = AuthorInText + , citationNoteNum = 1 + , citationHash = 0 + } + , Citation + { citationId = "b" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "@a", Space, Str "[p.", Space, Str "33;", Space, Str "@b]" ] + ] +] ``` diff --git a/test/command/csv.md b/test/command/csv.md index 75dccf1a7..d1d92d43e 100644 --- a/test/command/csv.md +++ b/test/command/csv.md @@ -5,42 +5,95 @@ Apple,25 cents,33 """Navel"" Orange","35 cents",22 ,,45 ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Fruit"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Price"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Quantity"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Apple"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "25",Space,Str "cents"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "33"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "\"Navel\"",Space,Str "Orange"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "35",Space,Str "cents"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "22"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "45"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Fruit" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Price" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Quantity" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Apple" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "25", Space, Str "cents" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "33" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "\"Navel\"", Space, Str "Orange" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "35", Space, Str "cents" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "22" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) [] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) [] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "45" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/docbook-bibliography.md b/test/command/docbook-bibliography.md index 37ac05b30..2709bddd3 100644 --- a/test/command/docbook-bibliography.md +++ b/test/command/docbook-bibliography.md @@ -13,8 +13,35 @@ </bibliomixed> </bibliodiv> ^D -[Header 1 ("",[],[]) [Str "Document",Space,Str "References"] -,Para [Span ("refTheFirst",[],[]) [],Str "[1]",Space,Str "First",Space,Str "reference"] -,Para [Span ("refTheSecond",[],[]) [],Str "[2]",Space,Str "Second",Space,Str "reference"] -,Para [Span ("refTheThird",[],[]) [],Str "[3]",Space,Str "Third",Space,Str "reference"]] +[ Header 1 + ( "", [], [] ) + [ Str "Document", Space, Str "References" ] +, Para + [ Span + ( "refTheFirst", [], [] ) [] + , Str "[1]" + , Space + , Str "First" + , Space + , Str "reference" + ] +, Para + [ Span + ( "refTheSecond", [], [] ) [] + , Str "[2]" + , Space + , Str "Second" + , Space + , Str "reference" + ] +, Para + [ Span + ( "refTheThird", [], [] ) [] + , Str "[3]" + , Space + , Str "Third" + , Space + , Str "reference" + ] +] ``` diff --git a/test/command/dots.md b/test/command/dots.md index 08bc561a8..c98a67026 100644 --- a/test/command/dots.md +++ b/test/command/dots.md @@ -6,7 +6,5 @@ \vdots ^D -[Para [Str "\8230"] -,Para [Str "\8230"] -,Para [Str "\8942"]] +[ Para [ Str "\8230" ], Para [ Str "\8230" ], Para [ Str "\8942" ] ] ``` diff --git a/test/command/empty_paragraphs.md b/test/command/empty_paragraphs.md index 14bd8d060..1f7c73fae 100644 --- a/test/command/empty_paragraphs.md +++ b/test/command/empty_paragraphs.md @@ -2,34 +2,28 @@ % pandoc -f native -t docx -o - | pandoc -f docx -t native [Para [Str "hi"], Para [], Para [], Para [Str "lo"]] ^D -[Para [Str "hi"] -,Para [Str "lo"]] +[ Para [ Str "hi" ], Para [ Str "lo" ] ] ``` ``` % pandoc -f native -t docx+empty_paragraphs -o - | pandoc -f docx -t native [Para [Str "hi"], Para [], Para [], Para [Str "lo"]] ^D -[Para [Str "hi"] -,Para [Str "lo"]] +[ Para [ Str "hi" ], Para [ Str "lo" ] ] ``` ``` % pandoc -f native -t docx -o - | pandoc -f docx+empty_paragraphs -t native [Para [Str "hi"], Para [], Para [], Para [Str "lo"]] ^D -[Para [Str "hi"] -,Para [Str "lo"]] +[ Para [ Str "hi" ], Para [ Str "lo" ] ] ``` ``` % pandoc -f native -t docx+empty_paragraphs -o - | pandoc -f docx+empty_paragraphs -t native [Para [Str "hi"], Para [], Para [], Para [Str "lo"]] ^D -[Para [Str "hi"] -,Para [] -,Para [] -,Para [Str "lo"]] +[ Para [ Str "hi" ], Para [], Para [], Para [ Str "lo" ] ] ``` ``` @@ -57,10 +51,7 @@ <p></p> <p>lo</p> ^D -[Para [Str "hi"] -,Para [] -,Para [] -,Para [Str "lo"]] +[ Para [ Str "hi" ], Para [], Para [], Para [ Str "lo" ] ] ``` ``` @@ -70,8 +61,7 @@ <p></p> <p>lo</p> ^D -[Para [Str "hi"] -,Para [Str "lo"]] +[ Para [ Str "hi" ], Para [ Str "lo" ] ] ``` ``` diff --git a/test/command/gfm.md b/test/command/gfm.md index f1bce1b89..9822b993d 100644 --- a/test/command/gfm.md +++ b/test/command/gfm.md @@ -7,37 +7,67 @@ gfm tests: | apple | 0.13 | | orange|1.12| ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidthDefault) - ,(AlignRight,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Fruit"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Price"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "apple"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "0.13"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "orange"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "1.12"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ ( AlignDefault, ColWidthDefault ), ( AlignRight, ColWidthDefault ) ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Fruit" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Price" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "apple" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "0.13" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "orange" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "1.12" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` ``` % pandoc -f gfm -t native ~~stricken out~~ ^D -[Para [Strikeout [Str "stricken",Space,Str "out"]]] +[ Para [ Strikeout [ Str "stricken", Space, Str "out" ] ] ] ``` ``` @@ -46,30 +76,47 @@ gfm tests: ## Header # -foo-bar_baz ^D -[Header 1 ("header",[],[]) [Str "Header"] -,Header 2 ("header-1",[],[]) [Str "Header"] -,Header 1 ("-foo-bar_baz",[],[]) [Str "-foo-bar_baz"]] +[ Header 1 + ( "header", [], [] ) + [ Str "Header" ] +, Header 2 + ( "header-1", [], [] ) + [ Str "Header" ] +, Header 1 + ( "-foo-bar_baz", [], [] ) + [ Str "-foo-bar_baz" ] +] ``` ``` % pandoc -f gfm -t native My:thumbsup:emoji:heart: ^D -[Para [Str "My",Span ("",["emoji"],[("data-emoji","thumbsup")]) [Str "\128077"],Str "emoji",Span ("",["emoji"],[("data-emoji","heart")]) [Str "\10084\65039"]]] +[ Para + [ Str "My" + , Span + ( "", [ "emoji" ], [ ( "data-emoji", "thumbsup" ) ] ) + [ Str "\128077" ] + , Str "emoji" + , Span + ( "", [ "emoji" ], [ ( "data-emoji", "heart" ) ] ) + [ Str "\10084\65039" ] + ] +] ``` ``` % pandoc -f gfm -t native "hi" ^D -[Para [Str "\"hi\""]] +[ Para [ Str "\"hi\"" ] ] ``` ``` % pandoc -f gfm+smart -t native "hi" ^D -[Para [Quoted DoubleQuote [Str "hi"]]] +[ Para [ Quoted DoubleQuote [ Str "hi" ] ] ] ``` ``` @@ -133,7 +180,7 @@ The caption. hi hi ^D -[Para [Str "hi",LineBreak,Str "hi"]] +[ Para [ Str "hi", LineBreak, Str "hi" ] ] ``` ``` @@ -141,9 +188,13 @@ hi - [ ] foo - [x] bar ^D -[BulletList - [[Plain [Str "\9744",Space,Str "foo"]] - ,[Plain [Str "\9746",Space,Str "bar"]]]] +[ BulletList + [ + [ Plain [ Str "\9744", Space, Str "foo" ] ] + , + [ Plain [ Str "\9746", Space, Str "bar" ] ] + ] +] ``` ``` @@ -151,9 +202,13 @@ hi - [ ] foo - [x] bar ^D -[BulletList - [[Plain [Str "[",Space,Str "]",Space,Str "foo"]] - ,[Plain [Str "[x]",Space,Str "bar"]]]] +[ BulletList + [ + [ Plain [ Str "[", Space, Str "]", Space, Str "foo" ] ] + , + [ Plain [ Str "[x]", Space, Str "bar" ] ] + ] +] ``` ``` diff --git a/test/command/hspace.md b/test/command/hspace.md index a8b97b8bc..8e2d19d8b 100644 --- a/test/command/hspace.md +++ b/test/command/hspace.md @@ -8,7 +8,9 @@ Here they need to be inline: \caption{lalune \hspace{2em} \vspace{1em} bloo} \end{figure} ^D -[RawBlock (Format "tex") "\\begin{figure}\n\\includegraphics{lalune.jpg}\n\\caption{lalune \\hspace{2em} \\vspace{1em} bloo}\n\\end{figure}"] +[ RawBlock + ( Format "tex" ) "\\begin{figure}\n\\includegraphics{lalune.jpg}\n\\caption{lalune \\hspace{2em} \\vspace{1em} bloo}\n\\end{figure}" +] ``` Here block: @@ -32,14 +34,18 @@ F & T &\\ F & F &\\ \end{tabular} ^D -[RawBlock (Format "tex") "\\begin{tabular}[t]{cc|c}\n\\(P\\) & \\(Q\\) & \\(P\\wedge Q\\)\\\\\n\\hline\nT & T &\\\\\nT & F &\\\\\nF & T &\\\\\nF & F &\\\\\n\\end{tabular}\n\\hspace{1em}\n\\begin{tabular}[t]{cc|c}\n\\(P\\) & \\(Q\\) & \\(P\\vee Q\\)\\\\\n\\hline\nT & T &\\\\\nT & F &\\\\\nF & T &\\\\\nF & F &\\\\\n\\end{tabular}"] +[ RawBlock + ( Format "tex" ) "\\begin{tabular}[t]{cc|c}\n\\(P\\) & \\(Q\\) & \\(P\\wedge Q\\)\\\\\n\\hline\nT & T &\\\\\nT & F &\\\\\nF & T &\\\\\nF & F &\\\\\n\\end{tabular}\n\\hspace{1em}\n\\begin{tabular}[t]{cc|c}\n\\(P\\) & \\(Q\\) & \\(P\\vee Q\\)\\\\\n\\hline\nT & T &\\\\\nT & F &\\\\\nF & T &\\\\\nF & F &\\\\\n\\end{tabular}" +] ``` ``` % pandoc -f markdown+raw_tex -t native hi\hspace{1em}there ^D -[Para [Str "hi",RawInline (Format "tex") "\\hspace{1em}",Str "there"]] +[ Para + [ Str "hi", RawInline ( Format "tex" ) "\\hspace{1em}", Str "there" ] +] ``` ``` @@ -50,7 +56,11 @@ hi there ^D -[Para [Str "hi"] -,RawBlock (Format "tex") "\\hspace{1em}" -,Para [Str "there"]] +[ Para + [ Str "hi" ] +, RawBlock + ( Format "tex" ) "\\hspace{1em}" +, Para + [ Str "there" ] +] ``` diff --git a/test/command/html-read-figure.md b/test/command/html-read-figure.md index 9c604c706..5b40c8b0d 100644 --- a/test/command/html-read-figure.md +++ b/test/command/html-read-figure.md @@ -5,7 +5,9 @@ <figcaption>bar</figcaption> </figure> ^D -[Para [Image ("",[],[]) [Str "bar"] ("foo.png","fig:voyage")]] +[ Para + [ Image ( "", [], [] ) [ Str "bar" ] ( "foo.png", "fig:voyage" ) ] +] ``` ``` @@ -15,7 +17,9 @@ <img src="foo.png" title="voyage"> </figure> ^D -[Para [Image ("",[],[]) [Str "bar"] ("foo.png","fig:voyage")]] +[ Para + [ Image ( "", [], [] ) [ Str "bar" ] ( "foo.png", "fig:voyage" ) ] +] ``` ``` @@ -24,7 +28,7 @@ <img src="foo.png" title="voyage"> </figure> ^D -[Para [Image ("",[],[]) [] ("foo.png","fig:voyage")]] +[ Para [ Image ( "", [], [] ) [] ( "foo.png", "fig:voyage" ) ] ] ``` ``` @@ -34,12 +38,20 @@ <figcaption>bar</figcaption> </figure> ^D -[Para [Image ("",[],[]) [Str "bar"] ("foo.png","fig:voyage")]] +[ Para + [ Image ( "", [], [] ) [ Str "bar" ] ( "foo.png", "fig:voyage" ) ] +] ``` ``` % pandoc -f html -t native <figure><img src="foo.png" title="voyage" alt="this is ignored"><figcaption>bar <strong>baz</strong></figcaption></figure> ^D -[Para [Image ("",[],[]) [Str "bar",Space,Strong [Str "baz"]] ("foo.png","fig:voyage")]] +[ Para + [ Image + ( "", [], [] ) + [ Str "bar", Space, Strong [ Str "baz" ] ] + ( "foo.png", "fig:voyage" ) + ] +] ``` diff --git a/test/command/html-trim-definition-list-terms.md b/test/command/html-trim-definition-list-terms.md index 08e58c73a..6733cdd77 100644 --- a/test/command/html-trim-definition-list-terms.md +++ b/test/command/html-trim-definition-list-terms.md @@ -11,7 +11,13 @@ <dd>test</dd> </dl> ^D -[DefinitionList - [([Str "foo",SoftBreak,Str "bar",LineBreak,Str "baz"], - [[Plain [Str "test"]]])]] +[ DefinitionList + [ + ( + [ Str "foo", SoftBreak, Str "bar", LineBreak, Str "baz" ] + , + [ [ Plain [ Str "test" ] ] ] + ) + ] +] ``` diff --git a/test/command/hyphenat.md b/test/command/hyphenat.md index 3aae85101..e584e1608 100644 --- a/test/command/hyphenat.md +++ b/test/command/hyphenat.md @@ -2,48 +2,56 @@ % pandoc -f latex -t native electromagnetic\hyp{}endioscopy ^D -[Para [Str "electromagnetic-endioscopy"]] +[ Para [ Str "electromagnetic-endioscopy" ] ] ``` ``` % pandoc -f latex -t native C\colonhyp\bshyp{}Windows\bshyp ^D -[Para [Str "C:\173\\\173Windows\\\173"]] +[ Para [ Str "C:\173\\\173Windows\\\173" ] ] ``` ``` % pandoc -f latex -t native \fshyp{}usr\fshyp{}share\fshyp ^D -[Para [Str "/\173usr/\173share/\173"]] +[ Para [ Str "/\173usr/\173share/\173" ] ] ``` ``` % pandoc -f latex -t native \fshyp{}home\fshyp{}schrieveslaach\fshyp\dothyp{}m2 ^D -[Para [Str "/\173home/\173schrieveslaach/\173.\173m2"]] +[ Para [ Str "/\173home/\173schrieveslaach/\173.\173m2" ] ] ``` ``` % pandoc -f latex -t native \nohyphens{Pneumonoultramicroscopicsilicovolcanoconiosis} ^D -[Para [Str "Pneumonoultramicroscopicsilicovolcanoconiosis"]] +[ Para [ Str "Pneumonoultramicroscopicsilicovolcanoconiosis" ] ] ``` ``` % pandoc -f latex -t native \textnhtt{Pneumonoultramicroscopicsilicovolcanoconiosis} ^D -[Para [Code ("",[],[]) "Pneumonoultramicroscopicsilicovolcanoconiosis"]] +[ Para + [ Code + ( "", [], [] ) "Pneumonoultramicroscopicsilicovolcanoconiosis" + ] +] ``` ``` % pandoc -f latex -t native \nhttfamily{Pneumonoultramicroscopicsilicovolcanoconiosis} ^D -[Para [Code ("",[],[]) "Pneumonoultramicroscopicsilicovolcanoconiosis"]] +[ Para + [ Code + ( "", [], [] ) "Pneumonoultramicroscopicsilicovolcanoconiosis" + ] +] ``` diff --git a/test/command/ifstrequal.md b/test/command/ifstrequal.md index 24ed7ef54..6ced0f016 100644 --- a/test/command/ifstrequal.md +++ b/test/command/ifstrequal.md @@ -5,5 +5,7 @@ \h{a} \h{b} ^D -[Para [Emph [Str "no"],SoftBreak,Str "\225",SoftBreak,Str "b"]] +[ Para + [ Emph [ Str "no" ], SoftBreak, Str "\225", SoftBreak, Str "b" ] +] ``` diff --git a/test/command/indented-fences.md b/test/command/indented-fences.md index eb3b78212..302c54621 100644 --- a/test/command/indented-fences.md +++ b/test/command/indented-fences.md @@ -5,7 +5,7 @@ in y ``` ^D -[CodeBlock ("",["haskell"],[]) "let x = y\nin y"] +[ CodeBlock ( "", [ "haskell" ], [] ) "let x = y\nin y" ] ````` ````` % pandoc -t native @@ -16,5 +16,5 @@ y + y ~~~ ^D -[CodeBlock ("",["haskell"],[]) " let x = y\nin y +\ny +\ny"] +[ CodeBlock ( "", [ "haskell" ], [] ) " let x = y\nin y +\ny +\ny" ] ````` diff --git a/test/command/input-with-endinput.md b/test/command/input-with-endinput.md index df0475a15..b97950d31 100644 --- a/test/command/input-with-endinput.md +++ b/test/command/input-with-endinput.md @@ -8,7 +8,11 @@ Visible Visible \end{document} ^D -[Para [Str "Visible"] -,Para [Emph [Str "hi",Space,Str "there"]] -,Para [Str "Visible"]] +[ Para + [ Str "Visible" ] +, Para + [ Emph [ Str "hi", Space, Str "there" ] ] +, Para + [ Str "Visible" ] +] ``` diff --git a/test/command/latex-center.md b/test/command/latex-center.md index 3d0bf0429..71e4fbabc 100644 --- a/test/command/latex-center.md +++ b/test/command/latex-center.md @@ -7,7 +7,6 @@ Hello \end{center} ^D -[Div ("",["center"],[]) - [Para [Str "Hello"]]] +[ Div ( "", [ "center" ], [] ) [ Para [ Str "Hello" ] ] ] ``` diff --git a/test/command/latex-color.md b/test/command/latex-color.md index 9fd2585a3..ad24528ec 100644 --- a/test/command/latex-color.md +++ b/test/command/latex-color.md @@ -4,21 +4,42 @@ % pandoc -f latex -t native Hello \textcolor{red}{World} ^D -[Para [Str "Hello",Space,Span ("",[],[("style","color: red")]) [Str "World"]]] +[ Para + [ Str "Hello" + , Space + , Span + ( "", [], [ ( "style", "color: red" ) ] ) + [ Str "World" ] + ] +] ``` ``` % pandoc -f latex -t native \textcolor{red}{Hello} World ^D -[Para [Span ("",[],[("style","color: red")]) [Str "Hello"],Space,Str "World"]] +[ Para + [ Span + ( "", [], [ ( "style", "color: red" ) ] ) + [ Str "Hello" ] + , Space + , Str "World" + ] +] ``` ``` % pandoc -f latex -t native Hello \textcolor{blue}{\textbf{World}} ^D -[Para [Str "Hello",Space,Span ("",[],[("style","color: blue")]) [Strong [Str "World"]]]] +[ Para + [ Str "Hello" + , Space + , Span + ( "", [], [ ( "style", "color: blue" ) ] ) + [ Strong [ Str "World" ] ] + ] +] ``` @@ -26,7 +47,15 @@ Hello \textcolor{blue}{\textbf{World}} % pandoc -f latex -t native Hello \textcolor{blue}{\textbf{World}}. ^D -[Para [Str "Hello",Space,Span ("",[],[("style","color: blue")]) [Strong [Str "World"]],Str "."]] +[ Para + [ Str "Hello" + , Space + , Span + ( "", [], [ ( "style", "color: blue" ) ] ) + [ Strong [ Str "World" ] ] + , Str "." + ] +] ``` ``` @@ -38,10 +67,16 @@ Hello \textcolor{blue}{\textbf{World}}. \end{itemize} } ^D -[Div ("",[],[("style","color: orange")]) - [BulletList - [[Para [Str "Item",Space,Str "1"]] - ,[Para [Str "Item",Space,Str "2"]]]]] +[ Div + ( "", [], [ ( "style", "color: orange" ) ] ) + [ BulletList + [ + [ Para [ Str "Item", Space, Str "1" ] ] + , + [ Para [ Str "Item", Space, Str "2" ] ] + ] + ] +] ``` ``` @@ -53,11 +88,18 @@ Hello \textcolor{blue}{\textbf{World}}. \end{itemize} } some more text ^D -[Div ("",[],[("style","color: blue")]) - [BulletList - [[Para [Str "Item",Space,Str "1"]] - ,[Para [Str "Item",Space,Str "2"]]]] -,Para [Str "some",Space,Str "more",Space,Str "text"]] +[ Div + ( "", [], [ ( "style", "color: blue" ) ] ) + [ BulletList + [ + [ Para [ Str "Item", Space, Str "1" ] ] + , + [ Para [ Str "Item", Space, Str "2" ] ] + ] + ] +, Para + [ Str "some", Space, Str "more", Space, Str "text" ] +] ``` # `\colorbox{}{}` @@ -67,28 +109,57 @@ Hello \textcolor{blue}{\textbf{World}}. % pandoc -f latex -t native Hello \colorbox{red}{World} ^D -[Para [Str "Hello",Space,Span ("",[],[("style","background-color: red")]) [Str "World"]]] +[ Para + [ Str "Hello" + , Space + , Span + ( "", [], [ ( "style", "background-color: red" ) ] ) + [ Str "World" ] + ] +] ``` ``` % pandoc -f latex -t native \colorbox{red}{Hello} World ^D -[Para [Span ("",[],[("style","background-color: red")]) [Str "Hello"],Space,Str "World"]] +[ Para + [ Span + ( "", [], [ ( "style", "background-color: red" ) ] ) + [ Str "Hello" ] + , Space + , Str "World" + ] +] ``` ``` % pandoc -f latex -t native Hello \colorbox{blue}{\textbf{World}} ^D -[Para [Str "Hello",Space,Span ("",[],[("style","background-color: blue")]) [Strong [Str "World"]]]] +[ Para + [ Str "Hello" + , Space + , Span + ( "", [], [ ( "style", "background-color: blue" ) ] ) + [ Strong [ Str "World" ] ] + ] +] ``` ``` % pandoc -f latex -t native Hello \colorbox{blue}{\textbf{World}}. ^D -[Para [Str "Hello",Space,Span ("",[],[("style","background-color: blue")]) [Strong [Str "World"]],Str "."]] +[ Para + [ Str "Hello" + , Space + , Span + ( "", [], [ ( "style", "background-color: blue" ) ] ) + [ Strong [ Str "World" ] ] + , Str "." + ] +] ``` ``` @@ -102,10 +173,16 @@ Hello \colorbox{blue}{\textbf{World}}. \end{minipage} } ^D -[Div ("",[],[("style","background-color: orange")]) - [BulletList - [[Para [Str "Item",Space,Str "1"]] - ,[Para [Str "Item",Space,Str "2"]]]]] +[ Div + ( "", [], [ ( "style", "background-color: orange" ) ] ) + [ BulletList + [ + [ Para [ Str "Item", Space, Str "1" ] ] + , + [ Para [ Str "Item", Space, Str "2" ] ] + ] + ] +] ``` ``` @@ -119,9 +196,16 @@ Hello \colorbox{blue}{\textbf{World}}. \end{minipage} } some more text ^D -[Div ("",[],[("style","background-color: blue")]) - [BulletList - [[Para [Str "Item",Space,Str "1"]] - ,[Para [Str "Item",Space,Str "2"]]]] -,Para [Str "some",Space,Str "more",Space,Str "text"]] +[ Div + ( "", [], [ ( "style", "background-color: blue" ) ] ) + [ BulletList + [ + [ Para [ Str "Item", Space, Str "1" ] ] + , + [ Para [ Str "Item", Space, Str "2" ] ] + ] + ] +, Para + [ Str "some", Space, Str "more", Space, Str "text" ] +] ``` diff --git a/test/command/latex-command-comment.md b/test/command/latex-command-comment.md index af679afba..1a1317925 100644 --- a/test/command/latex-command-comment.md +++ b/test/command/latex-command-comment.md @@ -3,5 +3,5 @@ \emph% {hi} ^D -[Para [Emph [Str "hi"]]] +[ Para [ Emph [ Str "hi" ] ] ] ``` diff --git a/test/command/latex-fontawesome.md b/test/command/latex-fontawesome.md index 2a7e91185..e67ed1792 100644 --- a/test/command/latex-fontawesome.md +++ b/test/command/latex-fontawesome.md @@ -2,12 +2,12 @@ % pandoc -f latex -t native Check: \faCheck ^D -[Para [Str "Check:",Space,Str "\10003"]] +[ Para [ Str "Check:", Space, Str "\10003" ] ] ``` ``` % pandoc -f latex -t native Close: \faClose ^D -[Para [Str "Close:",Space,Str "\10007"]] +[ Para [ Str "Close:", Space, Str "\10007" ] ] ``` diff --git a/test/command/latex-tabular-column-specs.md b/test/command/latex-tabular-column-specs.md index 7767667aa..a6b820262 100644 --- a/test/command/latex-tabular-column-specs.md +++ b/test/command/latex-tabular-column-specs.md @@ -11,35 +11,79 @@ f & 0.5 & 5,5 \\ \bottomrule \end{tabular} ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignLeft,ColWidthDefault) - ,(AlignLeft,ColWidthDefault) - ,(AlignLeft,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Math InlineMath ""]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Math InlineMath "f1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Math InlineMath "f2"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Math InlineMath "e"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Math InlineMath "0.5"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Math InlineMath "4"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Math InlineMath "f"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Math InlineMath "0.5"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Math InlineMath "5,5"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignLeft, ColWidthDefault ) + , + ( AlignLeft, ColWidthDefault ) + , + ( AlignLeft, ColWidthDefault ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Math InlineMath "" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Math InlineMath "f1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Math InlineMath "f2" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Math InlineMath "e" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Math InlineMath "0.5" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Math InlineMath "4" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Math InlineMath "f" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Math InlineMath "0.5" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Math InlineMath "5,5" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/lettrine.md b/test/command/lettrine.md index 7bbc20080..522e9b2ca 100644 --- a/test/command/lettrine.md +++ b/test/command/lettrine.md @@ -4,6 +4,23 @@ \lettrine[lhang=0.17]{A}{category} is ^D -[Para [Span ("",["lettrine"],[]) [Str "A"],SmallCaps [Str "category"],Space,Str "is"] -,Para [Span ("",["lettrine"],[]) [Str "A"],SmallCaps [Str "category"],Space,Str "is"]] +[ Para + [ Span + ( "", [ "lettrine" ], [] ) + [ Str "A" ] + , SmallCaps + [ Str "category" ] + , Space + , Str "is" + ] +, Para + [ Span + ( "", [ "lettrine" ], [] ) + [ Str "A" ] + , SmallCaps + [ Str "category" ] + , Space + , Str "is" + ] +] ``` diff --git a/test/command/lstlisting.md b/test/command/lstlisting.md index d928cc702..202a9d524 100644 --- a/test/command/lstlisting.md +++ b/test/command/lstlisting.md @@ -8,7 +8,19 @@ public class World { } \end{lstlisting} ^D -[CodeBlock ("lst:Hello-World",["java"],[("language","Java"),("caption","Java Example"),("label","lst:Hello-World")]) "public class World {\n public static void main(String[] args) {\n System.out.println(\"Hello World\");\n }\n}"] +[ CodeBlock + ( "lst:Hello-World" + , [ "java" ] + , + [ + ( "language", "Java" ) + , + ( "caption", "Java Example" ) + , + ( "label", "lst:Hello-World" ) + ] + ) "public class World {\n public static void main(String[] args) {\n System.out.println(\"Hello World\");\n }\n}" +] ``` ``` @@ -21,5 +33,19 @@ public class World { } \end{lstlisting} ^D -[CodeBlock ("lst:Hello-World",["java"],[("language","Java"),("escapechar","|"),("caption","Java Example"),("label","lst:Hello-World")]) "public class World {\n public static void main(String[] args) {\n System.out.println(\"Hello World\");\n }\n}"] +[ CodeBlock + ( "lst:Hello-World" + , [ "java" ] + , + [ + ( "language", "Java" ) + , + ( "escapechar", "|" ) + , + ( "caption", "Java Example" ) + , + ( "label", "lst:Hello-World" ) + ] + ) "public class World {\n public static void main(String[] args) {\n System.out.println(\"Hello World\");\n }\n}" +] ``` diff --git a/test/command/macro-defs-in-preamble.md b/test/command/macro-defs-in-preamble.md index dd5a503df..57aa2cb04 100644 --- a/test/command/macro-defs-in-preamble.md +++ b/test/command/macro-defs-in-preamble.md @@ -9,8 +9,13 @@ $\vara \varb$ \end{document} ^D -Pandoc (Meta {unMeta = fromList []}) -[RawBlock (Format "latex") "\\newcommand{\\vara}{\\alpha}" -,RawBlock (Format "latex") "\\newcommand{\\varb}{b}" -,Para [Math InlineMath "\\vara \\varb"]] +Pandoc + ( Meta { unMeta = fromList [] } ) + [ RawBlock + ( Format "latex" ) "\\newcommand{\\vara}{\\alpha}" + , RawBlock + ( Format "latex" ) "\\newcommand{\\varb}{b}" + , Para + [ Math InlineMath "\\vara \\varb" ] + ] ``` diff --git a/test/command/md-abbrevs.md b/test/command/md-abbrevs.md index 15ab8a728..75b34c08d 100644 --- a/test/command/md-abbrevs.md +++ b/test/command/md-abbrevs.md @@ -6,7 +6,7 @@ space from being inserted in LaTeX output). % pandoc -t native Mr. Bob ^D -[Para [Str "Mr.\160Bob"]] +[ Para [ Str "Mr.\160Bob" ] ] ``` If you don't want this to happen you can escape the period: @@ -15,6 +15,6 @@ If you don't want this to happen you can escape the period: % pandoc -t native Hi Mr\. Bob ^D -[Para [Str "Hi",Space,Str "Mr.",Space,Str "Bob"]] +[ Para [ Str "Hi", Space, Str "Mr.", Space, Str "Bob" ] ] ``` diff --git a/test/command/multiple-metadata-blocks.md b/test/command/multiple-metadata-blocks.md index 5adbfe423..d20eecc1f 100644 --- a/test/command/multiple-metadata-blocks.md +++ b/test/command/multiple-metadata-blocks.md @@ -10,6 +10,8 @@ foo: bar foo: bim ... ^D -Pandoc (Meta {unMeta = fromList [("foo",MetaInlines [Str "bim"])]}) -[] +Pandoc + ( Meta + { unMeta = fromList [ ( "foo", MetaInlines [ Str "bim" ] ) ] } + ) [] ``` diff --git a/test/command/refs.md b/test/command/refs.md index 320d63e17..165177175 100644 --- a/test/command/refs.md +++ b/test/command/refs.md @@ -2,21 +2,57 @@ % pandoc -f latex -t native Figure \ref{fig:1} ^D -[Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:1")]) [Str "[fig:1]"] ("#fig:1","")]] +[ Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , + [ ( "reference-type", "ref" ), ( "reference", "fig:1" ) ] + ) + [ Str "[fig:1]" ] + ( "#fig:1", "" ) + ] +] ``` ``` % pandoc -f latex -t native Figure \cref{fig:1} ^D -[Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:1")]) [Str "[fig:1]"] ("#fig:1","")]] +[ Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , + [ ( "reference-type", "ref" ), ( "reference", "fig:1" ) ] + ) + [ Str "[fig:1]" ] + ( "#fig:1", "" ) + ] +] ``` ``` % pandoc -f latex -t native Figure \vref{fig:1} ^D -[Para [Str "Figure",Space,Link ("",[],[("reference-type","ref+page"),("reference","fig:1")]) [Str "[fig:1]"] ("#fig:1","")]] +[ Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , + [ ( "reference-type", "ref+page" ), ( "reference", "fig:1" ) ] + ) + [ Str "[fig:1]" ] + ( "#fig:1", "" ) + ] +] ``` ``` @@ -28,8 +64,38 @@ Accuracy~\eqref{eq:Accuracy} is the proportion, measuring true results among all Accuracy = \frac{t_p + t_n}{t_p + f_p + f_n + t_n} \end{equation} ^D -[Para [Str "Accuracy\160",Link ("",[],[("reference-type","eqref"),("reference","eq:Accuracy")]) [Str "[eq:Accuracy]"] ("#eq:Accuracy",""),Space,Str "is",Space,Str "the",Space,Str "proportion,",Space,Str "measuring",Space,Str "true",Space,Str "results",Space,Str "among",Space,Str "all",Space,Str "results."] -,Para [Math DisplayMath "\\label{eq:Accuracy}\n Accuracy = \\frac{t_p + t_n}{t_p + f_p + f_n + t_n}"]] +[ Para + [ Str "Accuracy\160" + , Link + ( "" + , [] + , + [ ( "reference-type", "eqref" ), ( "reference", "eq:Accuracy" ) ] + ) + [ Str "[eq:Accuracy]" ] + ( "#eq:Accuracy", "" ) + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "proportion," + , Space + , Str "measuring" + , Space + , Str "true" + , Space + , Str "results" + , Space + , Str "among" + , Space + , Str "all" + , Space + , Str "results." + ] +, Para + [ Math DisplayMath "\\label{eq:Accuracy}\n Accuracy = \\frac{t_p + t_n}{t_p + f_p + f_n + t_n}" ] +] ``` ``` @@ -42,8 +108,33 @@ Accuracy~\eqref{eq:Accuracy} is the proportion, measuring true results among all Figure \ref{fig:Logo} illustrated the SVG logo ^D -[Para [Image ("fig:Logo",[],[]) [Str "Logo"] ("command/SVG_logo.svg","fig:")] -,Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:Logo")]) [Str "1"] ("#fig:Logo",""),Space,Str "illustrated",Space,Str "the",Space,Str "SVG",Space,Str "logo"]] +[ Para + [ Image + ( "fig:Logo", [], [] ) + [ Str "Logo" ] + ( "command/SVG_logo.svg", "fig:" ) + ] +, Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , + [ ( "reference-type", "ref" ), ( "reference", "fig:Logo" ) ] + ) + [ Str "1" ] + ( "#fig:Logo", "" ) + , Space + , Str "illustrated" + , Space + , Str "the" + , Space + , Str "SVG" + , Space + , Str "logo" + ] +] ``` ``` @@ -77,15 +168,94 @@ Figure \ref{fig:Logo2} illustrated the SVG logo Figure \ref{fig:Logo3} illustrated the SVG logo ^D -[Header 1 ("one",[],[]) [Str "One"] -,Para [Image ("fig:Logo",[],[]) [Str "Logo"] ("command/SVG_logo.svg","fig:")] -,Para [Image ("fig:Logo2",[],[]) [Str "Logo2"] ("command/SVG_logo2.svg","fig:")] -,Header 1 ("two",[],[]) [Str "Two"] -,Header 2 ("subone",[],[]) [Str "Subone"] -,Para [Image ("fig:Logo3",[],[]) [Str "Logo3"] ("command/SVG_logo3.svg","fig:")] -,Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:Logo")]) [Str "1.1"] ("#fig:Logo",""),Space,Str "illustrated",Space,Str "the",Space,Str "SVG",Space,Str "logo"] -,Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:Logo2")]) [Str "1.2"] ("#fig:Logo2",""),Space,Str "illustrated",Space,Str "the",Space,Str "SVG",Space,Str "logo"] -,Para [Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:Logo3")]) [Str "2.1"] ("#fig:Logo3",""),Space,Str "illustrated",Space,Str "the",Space,Str "SVG",Space,Str "logo"]] +[ Header 1 + ( "one", [], [] ) + [ Str "One" ] +, Para + [ Image + ( "fig:Logo", [], [] ) + [ Str "Logo" ] + ( "command/SVG_logo.svg", "fig:" ) + ] +, Para + [ Image + ( "fig:Logo2", [], [] ) + [ Str "Logo2" ] + ( "command/SVG_logo2.svg", "fig:" ) + ] +, Header 1 + ( "two", [], [] ) + [ Str "Two" ] +, Header 2 + ( "subone", [], [] ) + [ Str "Subone" ] +, Para + [ Image + ( "fig:Logo3", [], [] ) + [ Str "Logo3" ] + ( "command/SVG_logo3.svg", "fig:" ) + ] +, Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , + [ ( "reference-type", "ref" ), ( "reference", "fig:Logo" ) ] + ) + [ Str "1.1" ] + ( "#fig:Logo", "" ) + , Space + , Str "illustrated" + , Space + , Str "the" + , Space + , Str "SVG" + , Space + , Str "logo" + ] +, Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , + [ ( "reference-type", "ref" ), ( "reference", "fig:Logo2" ) ] + ) + [ Str "1.2" ] + ( "#fig:Logo2", "" ) + , Space + , Str "illustrated" + , Space + , Str "the" + , Space + , Str "SVG" + , Space + , Str "logo" + ] +, Para + [ Str "Figure" + , Space + , Link + ( "" + , [] + , + [ ( "reference-type", "ref" ), ( "reference", "fig:Logo3" ) ] + ) + [ Str "2.1" ] + ( "#fig:Logo3", "" ) + , Space + , Str "illustrated" + , Space + , Str "the" + , Space + , Str "SVG" + , Space + , Str "logo" + ] +] ``` @@ -93,5 +263,21 @@ Figure \ref{fig:Logo3} illustrated the SVG logo % pandoc -f latex -t native \label{section} Section \ref{section} ^D -[Para [Span ("section",[],[("label","section")]) [Str "[section]"],Space,Str "Section",Space,Link ("",[],[("reference-type","ref"),("reference","section")]) [Str "[section]"] ("#section","")]] +[ Para + [ Span + ( "section", [], [ ( "label", "section" ) ] ) + [ Str "[section]" ] + , Space + , Str "Section" + , Space + , Link + ( "" + , [] + , + [ ( "reference-type", "ref" ), ( "reference", "section" ) ] + ) + [ Str "[section]" ] + ( "#section", "" ) + ] +] ``` diff --git a/test/command/setext-fenced-div.md b/test/command/setext-fenced-div.md index 27301ea22..7be49e4a7 100644 --- a/test/command/setext-fenced-div.md +++ b/test/command/setext-fenced-div.md @@ -4,6 +4,5 @@ --- ::: ^D -[Div ("",["cell"],[]) - [HorizontalRule]] +[ Div ( "", [ "cell" ], [] ) [ HorizontalRule ] ] ``` diff --git a/test/command/shift-heading-level-by.md b/test/command/shift-heading-level-by.md index 323783f24..8397e7092 100644 --- a/test/command/shift-heading-level-by.md +++ b/test/command/shift-heading-level-by.md @@ -8,9 +8,19 @@ title: My title ## Second ^D -Pandoc (Meta {unMeta = fromList [("title",MetaInlines [Str "My",Space,Str "title"])]}) -[Header 2 ("first-heading",[],[]) [Str "First",Space,Str "heading"] -,Header 3 ("second",[],[]) [Str "Second"]] +Pandoc + ( Meta + { unMeta = fromList + [ ( "title", MetaInlines [ Str "My", Space, Str "title" ] ) ] + } + ) + [ Header 2 + ( "first-heading", [], [] ) + [ Str "First", Space, Str "heading" ] + , Header 3 + ( "second", [], [] ) + [ Str "Second" ] + ] ``` ``` @@ -25,8 +35,17 @@ title: Old title # Another top-level heading ^D -Pandoc (Meta {unMeta = fromList [("title",MetaInlines [Str "First",Space,Str "heading"])]}) -[Header 1 ("second",[],[]) [Str "Second"] -,Para [Str "Another",Space,Str "top-level",Space,Str "heading"]] +Pandoc + ( Meta + { unMeta = fromList + [ ( "title", MetaInlines [ Str "First", Space, Str "heading" ] ) ] + } + ) + [ Header 1 + ( "second", [], [] ) + [ Str "Second" ] + , Para + [ Str "Another", Space, Str "top-level", Space, Str "heading" ] + ] ``` diff --git a/test/command/sloppypar.md b/test/command/sloppypar.md index e2ff4d550..3ac62bf79 100644 --- a/test/command/sloppypar.md +++ b/test/command/sloppypar.md @@ -6,8 +6,111 @@ Sequi id qui facere et incidunt ut. Et fuga ut voluptate enim qui. Odit unde mag Qui et temporibus explicabo. Esse ab ut quidem. Vel qui perspiciatis quae odio consectetur alias non sed. Quo consectetur libero omnis quos eius ad vel. \end{sloppypar} ^D -[Para [Str "Sequi",Space,Str "id",Space,Str "qui",Space,Str "facere",Space,Str "et",Space,Str "incidunt",Space,Str "ut.",Space,Str "Et",Space,Str "fuga",Space,Str "ut",Space,Str "voluptate",Space,Str "enim",Space,Str "qui.",Space,Str "Odit",Space,Str "unde",Space,Str "magni",Space,Str "ipsam",Space,Str "dicta",Space,Str "modi.",Space,Str "Modi",Space,Str "soluta",Space,Str "velit",Space,Str "est",Space,Str "aut",Space,Str "aut",Space,Str "possimus."] -,Para [Str "Qui",Space,Str "et",Space,Str "temporibus",Space,Str "explicabo.",Space,Str "Esse",Space,Str "ab",Space,Str "ut",Space,Str "quidem.",Space,Str "Vel",Space,Str "qui",Space,Str "perspiciatis",Space,Str "quae",Space,Str "odio",Space,Str "consectetur",Space,Str "alias",Space,Str "non",Space,Str "sed.",Space,Str "Quo",Space,Str "consectetur",Space,Str "libero",Space,Str "omnis",Space,Str "quos",Space,Str "eius",Space,Str "ad",Space,Str "vel."]] +[ Para + [ Str "Sequi" + , Space + , Str "id" + , Space + , Str "qui" + , Space + , Str "facere" + , Space + , Str "et" + , Space + , Str "incidunt" + , Space + , Str "ut." + , Space + , Str "Et" + , Space + , Str "fuga" + , Space + , Str "ut" + , Space + , Str "voluptate" + , Space + , Str "enim" + , Space + , Str "qui." + , Space + , Str "Odit" + , Space + , Str "unde" + , Space + , Str "magni" + , Space + , Str "ipsam" + , Space + , Str "dicta" + , Space + , Str "modi." + , Space + , Str "Modi" + , Space + , Str "soluta" + , Space + , Str "velit" + , Space + , Str "est" + , Space + , Str "aut" + , Space + , Str "aut" + , Space + , Str "possimus." + ] +, Para + [ Str "Qui" + , Space + , Str "et" + , Space + , Str "temporibus" + , Space + , Str "explicabo." + , Space + , Str "Esse" + , Space + , Str "ab" + , Space + , Str "ut" + , Space + , Str "quidem." + , Space + , Str "Vel" + , Space + , Str "qui" + , Space + , Str "perspiciatis" + , Space + , Str "quae" + , Space + , Str "odio" + , Space + , Str "consectetur" + , Space + , Str "alias" + , Space + , Str "non" + , Space + , Str "sed." + , Space + , Str "Quo" + , Space + , Str "consectetur" + , Space + , Str "libero" + , Space + , Str "omnis" + , Space + , Str "quos" + , Space + , Str "eius" + , Space + , Str "ad" + , Space + , Str "vel." + ] +] ``` ``` @@ -18,6 +121,109 @@ Sequi id qui facere et incidunt ut. Et fuga ut voluptate enim qui. Odit unde mag Qui et temporibus explicabo. Esse ab ut quidem. Vel qui perspiciatis quae odio consectetur alias non sed. Quo consectetur libero omnis quos eius ad vel. \end{sloppypar} ^D -[Para [Str "Sequi",Space,Str "id",Space,Str "qui",Space,Str "facere",Space,Str "et",Space,Str "incidunt",Space,Str "ut.",Space,Str "Et",Space,Str "fuga",Space,Str "ut",Space,Str "voluptate",Space,Str "enim",Space,Str "qui.",Space,Str "Odit",Space,Str "unde",Space,Str "magni",Space,Str "ipsam",Space,Str "dicta",Space,Str "modi.",Space,Str "Modi",Space,Str "soluta",Space,Str "velit",Space,Str "est",Space,Str "aut",Space,Str "aut",Space,Str "possimus."] -,Para [Str "Qui",Space,Str "et",Space,Str "temporibus",Space,Str "explicabo.",Space,Str "Esse",Space,Str "ab",Space,Str "ut",Space,Str "quidem.",Space,Str "Vel",Space,Str "qui",Space,Str "perspiciatis",Space,Str "quae",Space,Str "odio",Space,Str "consectetur",Space,Str "alias",Space,Str "non",Space,Str "sed.",Space,Str "Quo",Space,Str "consectetur",Space,Str "libero",Space,Str "omnis",Space,Str "quos",Space,Str "eius",Space,Str "ad",Space,Str "vel."]] +[ Para + [ Str "Sequi" + , Space + , Str "id" + , Space + , Str "qui" + , Space + , Str "facere" + , Space + , Str "et" + , Space + , Str "incidunt" + , Space + , Str "ut." + , Space + , Str "Et" + , Space + , Str "fuga" + , Space + , Str "ut" + , Space + , Str "voluptate" + , Space + , Str "enim" + , Space + , Str "qui." + , Space + , Str "Odit" + , Space + , Str "unde" + , Space + , Str "magni" + , Space + , Str "ipsam" + , Space + , Str "dicta" + , Space + , Str "modi." + , Space + , Str "Modi" + , Space + , Str "soluta" + , Space + , Str "velit" + , Space + , Str "est" + , Space + , Str "aut" + , Space + , Str "aut" + , Space + , Str "possimus." + ] +, Para + [ Str "Qui" + , Space + , Str "et" + , Space + , Str "temporibus" + , Space + , Str "explicabo." + , Space + , Str "Esse" + , Space + , Str "ab" + , Space + , Str "ut" + , Space + , Str "quidem." + , Space + , Str "Vel" + , Space + , Str "qui" + , Space + , Str "perspiciatis" + , Space + , Str "quae" + , Space + , Str "odio" + , Space + , Str "consectetur" + , Space + , Str "alias" + , Space + , Str "non" + , Space + , Str "sed." + , Space + , Str "Quo" + , Space + , Str "consectetur" + , Space + , Str "libero" + , Space + , Str "omnis" + , Space + , Str "quos" + , Space + , Str "eius" + , Space + , Str "ad" + , Space + , Str "vel." + ] +] ``` diff --git a/test/command/table-with-cell-align.md b/test/command/table-with-cell-align.md index f6a454ad2..9b6e311bd 100644 --- a/test/command/table-with-cell-align.md +++ b/test/command/table-with-cell-align.md @@ -13,27 +13,49 @@ </tgroup> </informaltable> ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "1"]] - ,Cell ("",[],[]) AlignLeft (RowSpan 1) (ColSpan 1) - [Para [Str "2"]] - ,Cell ("",[],[]) AlignRight (RowSpan 1) (ColSpan 1) - [Para [Str "3"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Para [Str "4"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "1" ] ] + , Cell + ( "", [], [] ) AlignLeft + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "2" ] ] + , Cell + ( "", [], [] ) AlignRight + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "3" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "4" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` ``` % pandoc -f native -t opendocument --quiet diff --git a/test/command/table-with-column-span.md b/test/command/table-with-column-span.md index 55977554f..592e6d3da 100644 --- a/test/command/table-with-column-span.md +++ b/test/command/table-with-column-span.md @@ -49,73 +49,163 @@ </tgroup> </informaltable> ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2) - ,(AlignDefault,ColWidth 6.25e-2)] - (TableHead ("",[],[]) - []) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8) - [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "1"]]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8) - [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "2"]]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "16"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "15"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "14"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "13"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "12"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "11"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "10"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "9"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "8"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "7"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "6"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "5"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "4"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "3"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "2"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1) - [Para [Str "1"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8) - [Para [Str "Code",Space,Str "A"]] - ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8) - [Para [Str "Code",Space,Str "B"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + , + ( AlignDefault, ColWidth 6.25 e- 2 ) + ] + ( TableHead ( "", [], [] ) [] ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 8 ) + [ Para + [ Strong [ Str "Octet", Space, Str "no.", Space, Str "1" ] ] + ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 8 ) + [ Para + [ Strong [ Str "Octet", Space, Str "no.", Space, Str "2" ] ] + ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "16" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "15" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "14" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "13" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "12" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "11" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "10" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "9" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "8" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "7" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "6" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "5" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "4" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "3" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "2" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Para [ Str "1" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 8 ) + [ Para [ Str "Code", Space, Str "A" ] ] + , Cell + ( "", [], [] ) AlignCenter + ( RowSpan 1 ) + ( ColSpan 8 ) + [ Para [ Str "Code", Space, Str "B" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` ``` % pandoc -f native -t opendocument --quiet diff --git a/test/command/tabularx.md b/test/command/tabularx.md index 209517e00..a5056f518 100644 --- a/test/command/tabularx.md +++ b/test/command/tabularx.md @@ -20,44 +20,99 @@ \hline \end{tabularx} ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignCenter,ColWidthDefault) - ,(AlignCenter,ColWidthDefault) - ,(AlignCenter,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Column",Space,Str "Heading",Space,Str "2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "1.1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "1.2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "1.3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "2.1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "2.2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "2.3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "3.1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "3.2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "3.3"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignCenter, ColWidthDefault ) + , + ( AlignCenter, ColWidthDefault ) + , + ( AlignCenter, ColWidthDefault ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Column", Space, Str "Heading", Space, Str "1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Column", Space, Str "Heading", Space, Str "2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Column", Space, Str "Heading", Space, Str "3" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "1.1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "1.2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "1.3" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "2.1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "2.2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "2.3" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "3.1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "3.2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "3.3" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` ``` @@ -82,44 +137,99 @@ \hline \end{tabularx} ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignLeft,ColWidthDefault) - ,(AlignCenter,ColWidthDefault) - ,(AlignLeft,ColWidth 0.25)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Column",Space,Str "Heading",Space,Str "2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "1.1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "1.2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "1.3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "2.1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "2.2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "2.3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "3.1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "3.2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "3.3"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignLeft, ColWidthDefault ) + , + ( AlignCenter, ColWidthDefault ) + , + ( AlignLeft, ColWidth 0.25 ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Column", Space, Str "Heading", Space, Str "1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Column", Space, Str "Heading", Space, Str "2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Column", Space, Str "Heading", Space, Str "3" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "1.1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "1.2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "1.3" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "2.1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "2.2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "2.3" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "3.1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "3.2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "3.3" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` ``` @@ -144,42 +254,97 @@ \hline \end{tabularx} ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignLeft,ColWidth 0.25) - ,(AlignCenter,ColWidthDefault) - ,(AlignLeft,ColWidth 0.25)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Column",Space,Str "Heading",Space,Str "2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "1.1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "1.2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "1.3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "2.1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "2.2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "2.3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "3.1"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "3.2"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Cell",Space,Str "3.3"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignLeft, ColWidth 0.25 ) + , + ( AlignCenter, ColWidthDefault ) + , + ( AlignLeft, ColWidth 0.25 ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Column", Space, Str "Heading", Space, Str "1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Column", Space, Str "Heading", Space, Str "2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Column", Space, Str "Heading", Space, Str "3" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "1.1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "1.2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "1.3" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "2.1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "2.2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "2.3" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "3.1" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "3.2" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Cell", Space, Str "3.3" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` diff --git a/test/command/translations.md b/test/command/translations.md index 34531df7c..26d683860 100644 --- a/test/command/translations.md +++ b/test/command/translations.md @@ -2,14 +2,14 @@ % pandoc -f latex -t native -M lang=en \figurename\ 2 ^D -[Para [Str "Figure\160\&2"]] +[ Para [ Str "Figure\160\&2" ] ] ``` ``` % pandoc -f latex -t native -M lang=de-DE \figurename\ 2 ^D -[Para [Str "Abbildung\160\&2"]] +[ Para [ Str "Abbildung\160\&2" ] ] ``` ``` @@ -17,7 +17,7 @@ \setmainlanguage{german} \figurename 2 ^D -[Para [Str "Abbildung2"]] +[ Para [ Str "Abbildung2" ] ] ``` ``` @@ -25,5 +25,5 @@ \figurename~2 \figurename. ^D -[Para [Str "Slika\160\&2",SoftBreak,Str "Slika."]] +[ Para [ Str "Slika\160\&2", SoftBreak, Str "Slika." ] ] ``` diff --git a/test/command/write18.md b/test/command/write18.md index 5000c298b..45c7e0dd3 100644 --- a/test/command/write18.md +++ b/test/command/write18.md @@ -3,12 +3,12 @@ Handle \write18{..} as raw tex: % pandoc -t native \write18{git --version} ^D -[RawBlock (Format "tex") "\\write18{git --version}"] +[ RawBlock ( Format "tex" ) "\\write18{git --version}" ] ``` ``` % pandoc -f latex+raw_tex -t native \write18{git --version} ^D -[RawBlock (Format "latex") "\\write18{git --version}"] +[ RawBlock ( Format "latex" ) "\\write18{git --version}" ] ``` diff --git a/test/command/yaml-metadata-blocks.md b/test/command/yaml-metadata-blocks.md index 0733623dd..f782ffe59 100644 --- a/test/command/yaml-metadata-blocks.md +++ b/test/command/yaml-metadata-blocks.md @@ -6,8 +6,10 @@ foo: bar_: as should this --- ^D -Pandoc (Meta {unMeta = fromList [("foo",MetaMap (fromList []))]}) -[] +Pandoc + ( Meta + { unMeta = fromList [ ( "foo", MetaMap ( fromList [] ) ) ] } + ) [] ``` ``` % pandoc -s -t native @@ -32,8 +34,47 @@ nested: scientific: 3.7e-5 --- ^D -Pandoc (Meta {unMeta = fromList [("bool",MetaBool True),("empty",MetaList []),("float",MetaInlines [Str "1.5"]),("int",MetaInlines [Str "7"]),("more",MetaBool False),("nested",MetaMap (fromList [("bool",MetaBool True),("empty",MetaList []),("float",MetaInlines [Str "2.5"]),("int",MetaInlines [Str "8"]),("more",MetaBool False),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])])),("nothing",MetaInlines [Str "null"]),("scientific",MetaInlines [Str "3.7e-5"])]}) -[] +Pandoc + ( Meta + { unMeta = fromList + [ + ( "bool", MetaBool True ) + , + ( "empty", MetaList [] ) + , + ( "float", MetaInlines [ Str "1.5" ] ) + , + ( "int", MetaInlines [ Str "7" ] ) + , + ( "more", MetaBool False ) + , + ( "nested" + , MetaMap + ( fromList + [ + ( "bool", MetaBool True ) + , + ( "empty", MetaList [] ) + , + ( "float", MetaInlines [ Str "2.5" ] ) + , + ( "int", MetaInlines [ Str "8" ] ) + , + ( "more", MetaBool False ) + , + ( "nothing", MetaInlines [ Str "null" ] ) + , + ( "scientific", MetaInlines [ Str "3.7e-5" ] ) + ] + ) + ) + , + ( "nothing", MetaInlines [ Str "null" ] ) + , + ( "scientific", MetaInlines [ Str "3.7e-5" ] ) + ] + } + ) [] ``` ``` % pandoc -s -t native @@ -43,8 +84,21 @@ array: - bool: True --- ^D -Pandoc (Meta {unMeta = fromList [("array",MetaList [MetaMap (fromList [("foo",MetaInlines [Str "bar"])]),MetaMap (fromList [("bool",MetaBool True)])])]}) -[] +Pandoc + ( Meta + { unMeta = fromList + [ + ( "array" + , MetaList + [ MetaMap + ( fromList [ ( "foo", MetaInlines [ Str "bar" ] ) ] ) + , MetaMap + ( fromList [ ( "bool", MetaBool True ) ] ) + ] + ) + ] + } + ) [] ``` ``` % pandoc -s -t native --metadata-file command/yaml-metadata.yaml @@ -52,12 +106,34 @@ Pandoc (Meta {unMeta = fromList [("array",MetaList [MetaMap (fromList [("foo",Me title: document --- ^D -Pandoc (Meta {unMeta = fromList [("other",MetaInlines [Emph [Str "markdown"],Space,Str "value"]),("title",MetaInlines [Str "document"])]}) -[] +Pandoc + ( Meta + { unMeta = fromList + [ + ( "other" + , MetaInlines + [ Emph [ Str "markdown" ], Space, Str "value" ] + ) + , + ( "title", MetaInlines [ Str "document" ] ) + ] + } + ) [] ``` ``` % pandoc -s -t native --metadata-file command/yaml-metadata.yaml -M title=cmdline ^D -Pandoc (Meta {unMeta = fromList [("other",MetaInlines [Emph [Str "markdown"],Space,Str "value"]),("title",MetaString "cmdline")]}) -[] +Pandoc + ( Meta + { unMeta = fromList + [ + ( "other" + , MetaInlines + [ Emph [ Str "markdown" ], Space, Str "value" ] + ) + , + ( "title", MetaString "cmdline" ) + ] + } + ) [] ``` diff --git a/test/command/yaml-with-chomp.md b/test/command/yaml-with-chomp.md index d4c4f7cfd..94a736ab5 100644 --- a/test/command/yaml-with-chomp.md +++ b/test/command/yaml-with-chomp.md @@ -7,6 +7,15 @@ ml: |- BLOCK ... ^D -Pandoc (Meta {unMeta = fromList [("ml",MetaBlocks [Para [Str "TEST"],Plain [Str "BLOCK"]])]}) -[] +Pandoc + ( Meta + { unMeta = fromList + [ + ( "ml" + , MetaBlocks + [ Para [ Str "TEST" ], Plain [ Str "BLOCK" ] ] + ) + ] + } + ) [] ``` |