diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2021-09-28 21:17:53 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2021-09-28 21:17:53 -0700 |
| commit | 0bdcf415e4eff83ad8e35c1d41c8a28e0bbd5da1 (patch) | |
| tree | c9bda08418e67755254ad2d1d2e95dd691bd1902 /test/command | |
| parent | 8018179b3df34cd7fdbd77c7a08b21fd8d5b5b31 (diff) | |
| download | pandoc-0bdcf415e4eff83ad8e35c1d41c8a28e0bbd5da1.tar.gz | |
Switch from pretty-simple to pretty-show for native output.
Update tests.
Reason: it turns out that the native output generated by
pretty-simple isn't always readable by the native reader.
According to https://github.com/cdepillabout/pretty-simple/issues/99
it is not a design goal of the library that the rendered values
be readable using 'read'. This makes it unsuitable for our
purposes.
pretty-show is a bit slower and it uses 4-space indents
(non-configurable), but it doesn't have this serious drawback.
Diffstat (limited to 'test/command')
176 files changed, 4580 insertions, 4414 deletions
diff --git a/test/command/1390.md b/test/command/1390.md index 1d479dc94..4fea32290 100644 --- a/test/command/1390.md +++ b/test/command/1390.md @@ -4,7 +4,11 @@ Testing: $\mu\foo\eta$. ^D [ Para - [ Str "Testing:", Space, Math InlineMath "\\mu+\\eta", Str "." ] + [ Str "Testing:" + , Space + , Math InlineMath "\\mu+\\eta" + , Str "." + ] ] ``` diff --git a/test/command/1592.md b/test/command/1592.md index 8df5907d4..c3dc933a8 100644 --- a/test/command/1592.md +++ b/test/command/1592.md @@ -51,7 +51,9 @@ % pandoc -f html -t native <bdo dir="ltr">foo</bdo> ^D -[ Plain [ Span ( "", [], [ ( "dir", "ltr" ) ] ) [ Str "foo" ] ] ] +[ Plain + [ Span ( "" , [] , [ ( "dir" , "ltr" ) ] ) [ Str "foo" ] ] +] ``` ``` @@ -59,15 +61,13 @@ <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" + [ Span + ( "" , [] , [ ( "dir" , "rtl" ) ] ) + [ Str "foo" + , Span ( "" , [] , [ ( "dir" , "ltr" ) ] ) [ Str "bar" ] + , Str "baz" + ] ] - ] ] ``` @@ -77,22 +77,22 @@ 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." + [ 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 bc77117ac..59bd54ab4 100644 --- a/test/command/1608.md +++ b/test/command/1608.md @@ -29,182 +29,177 @@ 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 "." + ( "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." - ] + ( "" , [ "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" + ( "" , [ "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." - ] + ( "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." + ( "" , [ "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 02b426089..acd42b97d 100644 --- a/test/command/168.md +++ b/test/command/168.md @@ -12,23 +12,23 @@ nested div ::::::::::::::::::::::::::::::: ^D [ Div - ( "", [ "warning" ], [] ) - [ Para - [ Str "This" - , Space - , Str "is" - , Space - , Str "the" - , Space - , Str "warning!" + ( "" , [ "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" ] ] ] - , OrderedList - ( 1, Decimal, Period ) - [ [ Plain [ Str "list" ] ], [ Plain [ Str "another" ] ] ] - , Div - ( "myid", [ "class" ], [ ( "key", "val" ) ] ) - [ Para [ Str "nested", Space, Str "div" ] ] - ] ] ``` @@ -38,7 +38,14 @@ foo ::: bar ^D -[ Para [ Str "foo", SoftBreak, Str ":::", SoftBreak, Str "bar" ] ] +[ Para + [ Str "foo" + , SoftBreak + , Str ":::" + , SoftBreak + , Str "bar" + ] +] ``` ``` @@ -50,18 +57,17 @@ And another. ::::: ^D [ Div - ( "", [ "Warning" ], [] ) - [ Para - [ Str "Here" - , Space - , Str "is" - , Space - , Str "a" - , Space - , Str "paragraph." + ( "" , [ "Warning" ] , [] ) + [ Para + [ Str "Here" + , Space + , Str "is" + , Space + , Str "a" + , Space + , Str "paragraph." + ] + , Para [ Str "And" , Space , Str "another." ] ] - , Para - [ Str "And", Space, Str "another." ] - ] ] ``` diff --git a/test/command/1718.md b/test/command/1718.md index 132c5ba6a..c93067869 100644 --- a/test/command/1718.md +++ b/test/command/1718.md @@ -8,10 +8,12 @@ Note[^1]. ^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 "." - ] + [ 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 ee52ac867..c529ec972 100644 --- a/test/command/1773.md +++ b/test/command/1773.md @@ -2,5 +2,7 @@ % 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 92d0317ba..7a2468c1b 100644 --- a/test/command/1881.md +++ b/test/command/1881.md @@ -21,86 +21,90 @@ </table> ^D [ Table - ( "", [], [] ) - ( Caption Nothing - [ Plain - [ Str "Demonstration" - , Space - , Str "of" - , Space - , Str "simple" - , Space - , Str "table" - , Space - , Str "syntax." - ] + ( "" , [] , [] ) + (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 ) ] - ) - [ - ( 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" ] ] - ] + (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" ] ] + ] + ] ] - ) - [ 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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` @@ -116,47 +120,48 @@ </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" ] ] - ] + ( "" , [] , [] ) + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` diff --git a/test/command/2118.md b/test/command/2118.md index 54eaa2653..8be5c4886 100644 --- a/test/command/2118.md +++ b/test/command/2118.md @@ -8,10 +8,10 @@ \end{figure} ^D [ Para - [ Image - ( "fig:setminus", [], [ ( "width", "80%" ) ] ) - [ Str "Set", Space, Str "subtraction" ] - ( "setminus.png", "fig:" ) - ] + [ 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 4f2e4ff88..12b21d0a1 100644 --- a/test/command/2549.md +++ b/test/command/2549.md @@ -4,7 +4,9 @@ \section{A section}\label{foo} } ^D -[ Header 1 ( "foo", [], [] ) [ Str "A", Space, Str "section" ] ] +[ Header + 1 ( "foo" , [] , [] ) [ Str "A" , Space , Str "section" ] +] ``` ``` @@ -14,8 +16,10 @@ } ^D [ Div - ( "bar", [], [] ) - [ Header 1 ( "foo", [], [] ) [ Str "A", Space, Str "section" ] ] + ( "bar" , [] , [] ) + [ Header + 1 ( "foo" , [] , [] ) [ Str "A" , Space , Str "section" ] + ] ] ``` @@ -23,7 +27,12 @@ % 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" ] + ] +] ``` ``` @@ -34,6 +43,8 @@ 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 81c3dc95b..7e3f34dbd 100644 --- a/test/command/256.md +++ b/test/command/256.md @@ -3,20 +3,20 @@ 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." - ] + [ Str "Foo.\160bar" + , Space + , Str "baz" + , Space + , Str "h.k.\160and" + , Space + , Str "e.g." + , Space + , Str "and" + , Space + , Str "Mr." + , Space + , Str "Brown." + ] ] ``` ``` @@ -24,19 +24,19 @@ Foo. bar baz h.k. and e.g. and Mr. Brown. 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." - ] + [ 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 034f1542b..7452995b5 100644 --- a/test/command/3113.md +++ b/test/command/3113.md @@ -9,7 +9,10 @@ E&=&F \end{eqnarray} ^D [ Para - [ Math DisplayMath "\\begin{aligned}\nA&=&B,\\\\\nC&=&D,\\\\\n%\\end{eqnarray}\n%\\begin{eqnarray}\nE&=&F\\end{aligned}" ] + [ 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 a420d27c5..14f207e39 100644 --- a/test/command/3123.md +++ b/test/command/3123.md @@ -10,6 +10,8 @@ a<?php echo "1" ; ?> ^D [ Para - [ Str "a", RawInline ( Format "html" ) "<?php echo \"1\" ; ?>" ] + [ Str "a" + , RawInline (Format "html") "<?php echo \"1\" ; ?>" + ] ] ``` diff --git a/test/command/3236.md b/test/command/3236.md index 856e5f78c..b9a98f160 100644 --- a/test/command/3236.md +++ b/test/command/3236.md @@ -6,16 +6,16 @@ Magnificent \mycolor{} header. ^D [ Para - [ Image - ( "", [], [ ( "width", "17cm" ) ] ) - [ Str "image" ] - ( "red/header", "" ) - , SoftBreak - , Str "Magnificent" - , Space - , Str "red" - , Space - , Str "header." - ] + [ 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 5faabadf8..ef2419481 100644 --- a/test/command/3257.md +++ b/test/command/3257.md @@ -9,5 +9,5 @@ % 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 6f9e18bed..964136086 100644 --- a/test/command/3348.md +++ b/test/command/3348.md @@ -8,60 +8,63 @@ ----- ------------------------------------------------ ^D [ 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" - ] + ( "" , [] , [] ) + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` diff --git a/test/command/3401.md b/test/command/3401.md index 0f1e5f18f..3b16e84a4 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 diff --git a/test/command/3407.md b/test/command/3407.md index 551cefd1d..edc1bcb2b 100644 --- a/test/command/3407.md +++ b/test/command/3407.md @@ -10,6 +10,9 @@ :foo:`text` ^D [ Para - [ Code ( "", [ "interpreted-text" ], [ ( "role", "foo" ) ] ) "text" ] + [ Code + ( "" , [ "interpreted-text" ] , [ ( "role" , "foo" ) ] ) + "text" + ] ] ``` diff --git a/test/command/3510.md b/test/command/3510.md index ce4d59e79..48522f7e1 100644 --- a/test/command/3510.md +++ b/test/command/3510.md @@ -10,20 +10,13 @@ Text More text ^D -[ Para - [ Str "Text" ] -, Header 1 - ( "subsection", [], [] ) - [ Str "Subsection" ] -, Para - [ Str "Included", Space, Str "text" ] -, Plain - [ Str "Lorem", Space, Str "ipsum." ] +[ 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" ] + ( "" , [ "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 18a5f1641..0fede7a0e 100644 --- a/test/command/3511.md +++ b/test/command/3511.md @@ -11,20 +11,18 @@ not continuation ^D [ BulletList - [ - [ Plain - [ Str "a" ] - , BulletList - [ [ Plain [ Str "b" ], BulletList [ [ Plain [ Str "c" ] ] ] ] ] + [ [ Plain [ Str "a" ] + , BulletList + [ [ Plain [ Str "b" ] + , BulletList [ [ Plain [ Str "c" ] ] ] + ] + ] + ] + , [ CodeBlock ( "" , [] , [] ) "code" ] ] - , - [ CodeBlock ( "", [], [] ) "code" ] - ] , OrderedList - ( 1000, Decimal, Period ) - [ [ Plain [ Str "one" ] ] ] -, CodeBlock - ( "", [], [] ) "not continuation" + ( 1000 , Decimal , Period ) [ [ Plain [ Str "one" ] ] ] +, CodeBlock ( "" , [] , [] ) "not continuation" ] ``` @@ -41,15 +39,14 @@ continuation ^D [ BulletList - [ - [ Plain [ Str "a" ] ] - , - [ Plain [ Str "b" ], BulletList [ [ Plain [ Str "c" ] ] ] ] - , - [ CodeBlock ( "", [], [] ) "not code" ] - ] + [ [ Plain [ Str "a" ] ] + , [ Plain [ Str "b" ] + , BulletList [ [ Plain [ Str "c" ] ] ] + ] + , [ CodeBlock ( "" , [] , [] ) "not code" ] + ] , OrderedList - ( 1000, Decimal, Period ) - [ [ Para [ Str "one" ], Para [ Str "continuation" ] ] ] + ( 1000 , Decimal , Period ) + [ [ Para [ Str "one" ] , Para [ Str "continuation" ] ] ] ] ``` diff --git a/test/command/3516.md b/test/command/3516.md index 83e4cee95..615befb3e 100644 --- a/test/command/3516.md +++ b/test/command/3516.md @@ -25,44 +25,41 @@ on Windows builds. +---+---+ ^D [ 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 ) [] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 5.555555555555555e-2 ) + , ( AlignDefault , ColWidth 5.555555555555555e-2 ) ] - ] - ( TableFoot ( "", [], [] ) [] ) + (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 525c691f8..168cb7067 100644 --- a/test/command/3530.md +++ b/test/command/3530.md @@ -3,52 +3,54 @@ \subfile{command/sub-file-chapter-1} \subfile{command/sub-file-chapter-2} ^D -[ Header 1 - ( "chapter-1", [], [] ) - [ Str "Chapter", Space, Str "1" ] +[ 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" ] + [ 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." - ] + [ 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." + ] ] ``` @@ -58,8 +60,8 @@ \subfile{command/sub-file-chapter-2} ^D [ RawBlock - ( Format "latex" ) "\\subfile{command/sub-file-chapter-1}" + (Format "latex") "\\subfile{command/sub-file-chapter-1}" , RawBlock - ( Format "latex" ) "\\subfile{command/sub-file-chapter-2}" + (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 471bd827e..ed69ca860 100644 --- a/test/command/3533-rst-csv-tables.md +++ b/test/command/3533-rst-csv-tables.md @@ -6,106 +6,119 @@ :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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "Test" ] ]) + [ ( AlignDefault , ColWidth 0.4 ) + , ( AlignDefault , ColWidth 0.2 ) + , ( AlignDefault , ColWidth 0.4 ) ] - ) - [ 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?" - ] + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` @@ -121,78 +134,81 @@ '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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "Test" ] ]) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) ] - ) - [ 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" ] ] - ] + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` @@ -204,33 +220,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 "\"" ] ] - ] + ( "" , [] , [] ) + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` diff --git a/test/command/3534.md b/test/command/3534.md index 1be10cf62..8692007d2 100644 --- a/test/command/3534.md +++ b/test/command/3534.md @@ -19,24 +19,23 @@ I want to explain the interface of \lstinline{public class MyClass}. 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 "." - ] + [ 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 "." + ] ] ``` @@ -61,23 +60,22 @@ I want to explain the interface of \mintinline{java}|public class MyClass|. 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 "." - ] + [ 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 934e35836..98704c930 100644 --- a/test/command/3537.md +++ b/test/command/3537.md @@ -7,7 +7,7 @@ Generalized raw attributes. foo bar ``` ^D -[ RawBlock ( Format "ms" ) ".MACRO\nfoo bar" ] +[ RawBlock (Format "ms") ".MACRO\nfoo bar" ] ```` ```` @@ -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 464df7c91..b2ce5455f 100644 --- a/test/command/3539.md +++ b/test/command/3539.md @@ -5,45 +5,43 @@ 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." - ] + [ 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." + ] ] ``` @@ -52,44 +50,38 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a \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." - ] + [ 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." + ] ] ``` @@ -98,44 +90,38 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a \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." - ] + [ 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." + ] ] ``` @@ -144,44 +130,38 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a \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." - ] + [ 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." + ] ] ``` @@ -190,44 +170,38 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a \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." - ] + [ 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." + ] ] ``` @@ -238,44 +212,42 @@ Many programming languages provide \glspl{API}. Each \gls{API} should provide a 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." - ] + [ 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 0da806b1f..c9c782c16 100644 --- a/test/command/3558.md +++ b/test/command/3558.md @@ -6,11 +6,8 @@ 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 2cda46993..3f014db94 100644 --- a/test/command/3585.md +++ b/test/command/3585.md @@ -4,29 +4,26 @@ 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 [ 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\"" - ] + [ 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\"" + ] ] ``` diff --git a/test/command/3587.md b/test/command/3587.md index 402ad7d9f..88f009900 100644 --- a/test/command/3587.md +++ b/test/command/3587.md @@ -3,16 +3,16 @@ \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" - ] + [ Str "1\160m" + , Space + , Str "is" + , Space + , Str "equal" + , Space + , Str "to" + , Space + , Str "1000\160mm" + ] ] ``` @@ -21,16 +21,16 @@ \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" - ] + [ Str "$\160\&1" + , Space + , Str "is" + , Space + , Str "equal" + , Space + , Str "to" + , Space + , Str "0.938094\160\8364" + ] ] ``` @@ -53,7 +53,7 @@ % pandoc -f latex -t native \SI{25}{\square\meter} ^D -[ Para [ Str "25\160m", Superscript [ Str "2" ] ] ] +[ Para [ Str "25\160m" , Superscript [ Str "2" ] ] ] ``` ``` @@ -109,13 +109,11 @@ \SIrange{10}{20}{\square\meter} ^D [ Para - [ Str "10\160m" - , Superscript - [ Str "2" ] - , Str "\8211\&20\160m" - , Superscript - [ Str "2" ] - ] + [ Str "10\160m" + , Superscript [ Str "2" ] + , Str "\8211\&20\160m" + , Superscript [ Str "2" ] + ] ] ``` @@ -139,13 +137,11 @@ \SIrange{10}{20}{\raisetothe{4}\meter} ^D [ Para - [ Str "10\160m" - , Superscript - [ Str "4" ] - , Str "\8211\&20\160m" - , Superscript - [ Str "4" ] - ] + [ Str "10\160m" + , Superscript [ Str "4" ] + , Str "\8211\&20\160m" + , Superscript [ Str "4" ] + ] ] ``` @@ -155,13 +151,11 @@ \SIrange{10}{20}{\meter\squared} ^D [ Para - [ Str "10\160m" - , Superscript - [ Str "2" ] - , Str "\8211\&20\160m" - , Superscript - [ Str "2" ] - ] + [ Str "10\160m" + , Superscript [ Str "2" ] + , Str "\8211\&20\160m" + , Superscript [ Str "2" ] + ] ] ``` @@ -185,13 +179,11 @@ \SIrange{10}{20}{\meter\tothe{4}} ^D [ Para - [ Str "10\160m" - , Superscript - [ Str "4" ] - , Str "\8211\&20\160m" - , Superscript - [ Str "4" ] - ] + [ Str "10\160m" + , Superscript [ Str "4" ] + , Str "\8211\&20\160m" + , Superscript [ Str "4" ] + ] ] ``` diff --git a/test/command/3681.md b/test/command/3681.md index e374f1c35..3e6c71a47 100644 --- a/test/command/3681.md +++ b/test/command/3681.md @@ -5,32 +5,32 @@ 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:" - ] + [ 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:" + ] ] ``` @@ -41,20 +41,20 @@ 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", "" ) - ] + [ 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." ] - , Space - , Str "is" - , Space - , Str "awesome." - ] ] ``` @@ -65,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 52e1eacbf..fcd95dfdd 100644 --- a/test/command/3706.md +++ b/test/command/3706.md @@ -16,78 +16,84 @@ Results marker can be hidden in block attributes (#3706) | 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" ] ] + ( "tab" , [] , [] ) + [ Table + ( "" , [] , [] ) + (Caption Nothing [ Plain [ Str "Lalelu." ] ]) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) ] - , Row - ( "", [], [] ) - [ Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "3" ] ] - , Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "La" ] ] + (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 ( "" , [] , [] ) []) ] - ( TableFoot ( "", [], [] ) [] ) - ] ] ``` diff --git a/test/command/3708.md b/test/command/3708.md index 435d6940c..e456617de 100644 --- a/test/command/3708.md +++ b/test/command/3708.md @@ -6,41 +6,48 @@ \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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) ] - ] - ( TableFoot ( "", [], [] ) [] ) + (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 90cdcff6c..0b24d0c1b 100644 --- a/test/command/3733.md +++ b/test/command/3733.md @@ -7,8 +7,7 @@ some: code ``` ^D [ BulletList - [ [ Plain [ Str "Item1" ] ], [ Plain [ Str "Item2" ] ] ] -, CodeBlock - ( "", [ "yaml" ], [] ) "some: code" + [ [ Plain [ Str "Item1" ] ] , [ Plain [ Str "Item2" ] ] ] +, CodeBlock ( "" , [ "yaml" ] , [] ) "some: code" ] ```` diff --git a/test/command/3755.md b/test/command/3755.md index b9f38d441..e89eaec35 100644 --- a/test/command/3755.md +++ b/test/command/3755.md @@ -6,18 +6,17 @@ date: '22. Juni 2017' --- ^D Pandoc - ( Meta - { unMeta = fromList - [ - ( "date" - , MetaInlines - [ Str "22.", Space, Str "Juni", Space, Str "2017" ] - ) - , - ( "title", MetaInlines [ Str "Titel" ] ) - ] + Meta + { unMeta = + fromList + [ ( "date" + , MetaInlines + [ Str "22." , Space , Str "Juni" , Space , Str "2017" ] + ) + , ( "title" , MetaInlines [ Str "Titel" ] ) + ] } - ) [] + [] ``` ``` @@ -29,23 +28,22 @@ date: | --- ^D Pandoc - ( Meta - { unMeta = fromList - [ - ( "date" - , MetaBlocks - [ OrderedList - ( 22, Decimal, Period ) - [ [ Plain [ Str "Juni", Space, Str "2017" ] ] ] + Meta + { unMeta = + fromList + [ ( "date" + , MetaBlocks + [ OrderedList + ( 22 , Decimal , Period ) + [ [ Plain [ Str "Juni" , Space , Str "2017" ] ] ] + ] + ) + , ( "title" + , MetaBlocks + [ Div ( "" , [] , [] ) [ Plain [ Str "foo" ] ] ] + ) ] - ) - , - ( "title" - , MetaBlocks - [ Div ( "", [], [] ) [ Plain [ Str "foo" ] ] ] - ) - ] } - ) [] + [] ``` diff --git a/test/command/3779.md b/test/command/3779.md index 45c91a92c..04111c2a6 100644 --- a/test/command/3779.md +++ b/test/command/3779.md @@ -21,39 +21,37 @@ } ^D [ BulletList - [ - [ Para - [ Str "Pandoc" - , Space - , Str "is" - , Space - , Str "100%" - , Space - , Str "awesome." + [ [ 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 "200%" + , Space + , Str "awesome." + ] ] ] - ] , Para - [ Str "Pandoc" - , Space - , Str "is" - , Space - , Str "300%" - , Space - , Str "awesome." - ] + [ Str "Pandoc" + , Space + , Str "is" + , Space + , Str "300%" + , Space + , Str "awesome." + ] ] ``` diff --git a/test/command/3794.md b/test/command/3794.md index 571fb848d..974b7dbe4 100644 --- a/test/command/3794.md +++ b/test/command/3794.md @@ -2,5 +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 b80b1ce5a..6637b23c7 100644 --- a/test/command/3804.md +++ b/test/command/3804.md @@ -3,6 +3,7 @@ \titleformat{\chapter}[display]{\normalfont\large\bfseries}{第\thechapter{}章}{20pt}{\Huge} ^D [ RawBlock - ( Format "tex" ) "\\titleformat{\\chapter}[display]{\\normalfont\\large\\bfseries}{\31532\\thechapter{}\31456}{20pt}{\\Huge}" + (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 6b8be15c5..caf21ed54 100644 --- a/test/command/3853.md +++ b/test/command/3853.md @@ -20,11 +20,9 @@ more hello \iftoggle{ebook}{ebook}{noebook} ^D -[ Para - [ Str "ebook", SoftBreak, Str "more" ] +[ Para [ Str "ebook" , SoftBreak , Str "more" ] , Para - [ Str "not", Space, Str "ebook", SoftBreak, Str "more" ] -, Para - [ Str "hello", Space, Str "noebook" ] + [ Str "not" , Space , Str "ebook" , SoftBreak , Str "more" ] +, Para [ Str "hello" , Space , Str "noebook" ] ] ``` diff --git a/test/command/3916.md b/test/command/3916.md index 47cd72861..8775ae7f6 100644 --- a/test/command/3916.md +++ b/test/command/3916.md @@ -5,15 +5,11 @@ # more ^D [ OrderedList - ( 1, DefaultStyle, DefaultDelim ) - [ - [ Plain - [ Str "text", Space, Str "text" ] - , CodeBlock - ( "", [], [] ) "blabla" + ( 1 , DefaultStyle , DefaultDelim ) + [ [ Plain [ Str "text" , Space , Str "text" ] + , CodeBlock ( "" , [] , [] ) "blabla" + ] + , [ Plain [ Str "more" ] ] ] - , - [ Plain [ Str "more" ] ] - ] ] ``` diff --git a/test/command/3947.md b/test/command/3947.md index 095b26767..68118a9da 100644 --- a/test/command/3947.md +++ b/test/command/3947.md @@ -6,9 +6,8 @@ Another Code block ^D -[ RawBlock - ( Format "tex" ) "\\newpage" +[ RawBlock (Format "tex") "\\newpage" , CodeBlock - ( "", [], [] ) "Code block\n\nAnother Code block" + ( "" , [] , [] ) "Code block\n\nAnother Code block" ] ``` diff --git a/test/command/3958.md b/test/command/3958.md index cf93d0f74..eccf632c4 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 013125444..b051caed3 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 4af4bc3eb..c13aea850 100644 --- a/test/command/3983.md +++ b/test/command/3983.md @@ -19,10 +19,8 @@ \DeclareRobustCommand{\urlfootnote}{\hyper@normalise\urlfootnote@} \makeatother ^D -[ RawBlock - ( Format "latex" ) "\\makeatletter" -, RawBlock - ( Format "latex" ) "\\makeatother" +[ RawBlock (Format "latex") "\\makeatletter" +, RawBlock (Format "latex") "\\makeatother" ] ``` @@ -31,5 +29,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 75872a102..647aa355a 100644 --- a/test/command/3989.md +++ b/test/command/3989.md @@ -4,21 +4,19 @@ <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" ] - ] + [ 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/4054.md b/test/command/4054.md index 9afef48b5..81c6e4012 100644 --- a/test/command/4054.md +++ b/test/command/4054.md @@ -3,16 +3,19 @@ % Old ^D Pandoc - ( Meta { unMeta = fromList [ ( "title", MetaString "New" ) ] } ) [] + 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" ] ) ] + Meta + { unMeta = + fromList + [ ( "foo" , MetaList [ MetaString "1" , MetaString "2" ] ) ] } - ) [] + [] ``` diff --git a/test/command/4056.md b/test/command/4056.md index 3b2341644..c270d25ca 100644 --- a/test/command/4056.md +++ b/test/command/4056.md @@ -6,7 +6,8 @@ } ^D [ RawBlock - ( Format "tex" ) "\\parbox[t]{0.4\\textwidth}{\n\\begin{shaded}\n\\end{shaded}\n}" + (Format "tex") + "\\parbox[t]{0.4\\textwidth}{\n\\begin{shaded}\n\\end{shaded}\n}" ] ``` @@ -17,39 +18,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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignRight , ColWidthDefault ) + , ( AlignRight , ColWidthDefault ) ] - ] - ( TableFoot ( "", [], [] ) [] ) + (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 ca7b3007e..29aeae854 100644 --- a/test/command/4063.md +++ b/test/command/4063.md @@ -12,28 +12,33 @@ </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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.3 ) + , ( AlignDefault , ColWidth 0.7 ) ] - ] - ( TableFoot ( "", [], [] ) [] ) + (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 53fb660d0..83527a6fd 100644 --- a/test/command/4068.md +++ b/test/command/4068.md @@ -5,24 +5,29 @@ [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", "" ) - ] + [ 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]" - ] + [ 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 e41991874..fcbf79386 100644 --- a/test/command/4119.md +++ b/test/command/4119.md @@ -9,51 +9,55 @@ 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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) ] - ) - [ TableBody - ( "", [], [] ) - ( RowHeadColumns 0 ) [] - [ Row - ( "", [], [] ) - [ Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "1" ] ] - , Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "2" ] ] - ] + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) , Div - ( "", [ "notes" ], [] ) - [ Para [ Str "not", Space, Str "a", Space, Str "caption!" ] ] + ( "" , [ "notes" ] , [] ) + [ Para + [ Str "not" , Space , Str "a" , Space , Str "caption!" ] + ] ] ``` diff --git a/test/command/4134.md b/test/command/4134.md index d850e5740..195d85129 100644 --- a/test/command/4134.md +++ b/test/command/4134.md @@ -20,5 +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 1451a03df..bea4632c9 100644 --- a/test/command/4159.md +++ b/test/command/4159.md @@ -3,9 +3,7 @@ \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 ca54cf953..85b48dbdf 100644 --- a/test/command/4162.md +++ b/test/command/4162.md @@ -3,5 +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 cf889af73..0fa940a63 100644 --- a/test/command/4183.md +++ b/test/command/4183.md @@ -18,7 +18,9 @@ </figcaption> </figure> ^D -[ Para [ Image ( "", [], [] ) [ Str "baz" ] ( "foo", "fig:" ) ] ] +[ Para + [ Image ( "" , [] , [] ) [ Str "baz" ] ( "foo" , "fig:" ) ] +] ``` ``` @@ -29,6 +31,8 @@ </figure> ^D [ Para - [ Image ( "", [], [] ) [ Emph [ Str "baz" ] ] ( "foo", "fig:" ) ] + [ Image + ( "" , [] , [] ) [ Emph [ Str "baz" ] ] ( "foo" , "fig:" ) + ] ] ``` diff --git a/test/command/4186.md b/test/command/4186.md index 9ac457748..90ac1271b 100644 --- a/test/command/4186.md +++ b/test/command/4186.md @@ -5,10 +5,8 @@ #+end_example ^D [ CodeBlock - ( "" - , [ "example" ] - , [] - ) " This should retain the four leading spaces\n" + ( "" , [ "example" ] , [] ) + " This should retain the four leading spaces\n" ] ``` diff --git a/test/command/4193.md b/test/command/4193.md index f659349fd..67ca5a4f7 100644 --- a/test/command/4193.md +++ b/test/command/4193.md @@ -4,5 +4,7 @@ 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 953917f58..36385bc2a 100644 --- a/test/command/4199.md +++ b/test/command/4199.md @@ -2,5 +2,8 @@ % 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 861184728..49585438a 100644 --- a/test/command/4240.md +++ b/test/command/4240.md @@ -26,26 +26,19 @@ header4 ~~~~~~~ ^D Pandoc - ( Meta - { unMeta = fromList - [ - ( "subtitle", MetaInlines [ Str "Subtitle" ] ) - , - ( "title", MetaInlines [ Str "Title" ] ) - ] + 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", [], [] ) [] ] + [ 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/4280.md b/test/command/4280.md index 5a198682b..343a2ab07 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 db5119a5c..53943e503 100644 --- a/test/command/4281.md +++ b/test/command/4281.md @@ -10,17 +10,12 @@ :::: ^D [ Div - ( "", [ "a" ], [] ) - [ BulletList - [ - [ Div - ( "", [ "b" ], [] ) - [ Para [ Str "text" ] ] - , Div - ( "", [ "c" ], [] ) - [ Para [ Str "text" ] ] - ] + ( "" , [ "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 5c2ad9620..0308f521f 100644 --- a/test/command/4284.md +++ b/test/command/4284.md @@ -8,30 +8,33 @@ ** 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" ] ] + ] ] ``` @@ -41,18 +44,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" ] ] + ] ] ``` @@ -64,18 +68,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" ] ] + ] ] ``` @@ -84,29 +89,32 @@ #+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 3f5caa8fc..dcb90e312 100644 --- a/test/command/4306.md +++ b/test/command/4306.md @@ -7,17 +7,16 @@ 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 "." - ] + [ 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 f7587999e..4a0990fff 100644 --- a/test/command/4374.md +++ b/test/command/4374.md @@ -4,17 +4,17 @@ } ^D [ Para - [ Cite - [ Citation - { citationId = "a" - , citationPrefix = [] - , citationSuffix = [] - , citationMode = NormalCitation - , citationNoteNum = 0 - , citationHash = 0 - } + [ Cite + [ Citation + { citationId = "a" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline (Format "latex") "\\cite{a%\n}" ] ] - [ RawInline ( Format "latex" ) "\\cite{a%\n}" ] - ] ] ``` diff --git a/test/command/4382.md b/test/command/4382.md index 1eb9c3b64..847f4732e 100644 --- a/test/command/4382.md +++ b/test/command/4382.md @@ -4,5 +4,5 @@ ===== ^D -[ BulletList [ [] ], HorizontalRule ] +[ BulletList [ [] ] , HorizontalRule ] ``` diff --git a/test/command/4454.md b/test/command/4454.md index 8781b914c..aeb62aabb 100644 --- a/test/command/4454.md +++ b/test/command/4454.md @@ -3,5 +3,7 @@ • 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 7a78860ea..5e86d6ee4 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 a149a699f..1f36d1958 100644 --- a/test/command/4513.md +++ b/test/command/4513.md @@ -3,31 +3,30 @@ |_. 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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) ] - ) - [ TableBody ( "", [], [] ) ( RowHeadColumns 0 ) [] [] ] - ( TableFoot ( "", [], [] ) [] ) + (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/4553.md b/test/command/4553.md index 1d7a71cca..0104a08a8 100644 --- a/test/command/4553.md +++ b/test/command/4553.md @@ -2,13 +2,20 @@ % 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/4579.md b/test/command/4579.md index f22494e16..353a4a514 100644 --- a/test/command/4579.md +++ b/test/command/4579.md @@ -9,48 +9,50 @@ - 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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) ] - ) - [ TableBody - ( "", [], [] ) - ( RowHeadColumns 0 ) [] - [ Row - ( "", [], [] ) - [ Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "spam" ] ] - , Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "ham" ] ] - ] + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` diff --git a/test/command/4624.md b/test/command/4624.md index dd46a564b..abbdf61f4 100644 --- a/test/command/4624.md +++ b/test/command/4624.md @@ -23,14 +23,11 @@ code4 code5\end{verbatim} ^D [ CodeBlock - ( "", [], [ ( "key1", "value1" ) ] ) "code1\n" + ( "" , [] , [ ( "key1" , "value1" ) ] ) "code1\n" , CodeBlock - ( "", [], [ ( "key2", "value2" ) ] ) "code2\n " -, CodeBlock - ( "", [], [] ) "code3" -, CodeBlock - ( "", [], [] ) "code4" -, CodeBlock - ( "", [], [] ) "code5" + ( "" , [] , [ ( "key2" , "value2" ) ] ) "code2\n " +, CodeBlock ( "" , [] , [] ) "code3" +, CodeBlock ( "" , [] , [] ) "code4" +, CodeBlock ( "" , [] , [] ) "code5" ] ``` diff --git a/test/command/4635.md b/test/command/4635.md index 4b029604b..7acb08539 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,9 @@ 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 +21,7 @@ foo) cf. foo ^D -[ Para [ Str "cf.", SoftBreak, Str "foo" ] ] +[ Para [ Str "cf." , SoftBreak , Str "foo" ] ] ``` ``` @@ -27,5 +29,7 @@ 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 20aaaca7e..41f6ae327 100644 --- a/test/command/4669.md +++ b/test/command/4669.md @@ -7,9 +7,8 @@ \end{verbatim} ^D [ Para - [ Span ( "", [], [] ) [ Code ( "", [], [] ) "<-" ] ] -, CodeBlock - ( "", [], [] ) " while (n > 0) {" + [ Span ( "" , [] , [] ) [ Code ( "" , [] , [] ) "<-" ] ] +, CodeBlock ( "" , [] , [] ) " while (n > 0) {" ] ``` @@ -24,16 +23,11 @@ \end{itemize} ^D [ BulletList - [ - [ Para [ Str "one" ] ] - , - [ Para [ Str "two" ] ] - , - [ Para [ Str "three" ] ] - , - [ Para [ Str "four" ] ] - , - [ Para [ Str "five" ] ] - ] + [ [ 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 58ba70544..f6bf8736d 100644 --- a/test/command/4715.md +++ b/test/command/4715.md @@ -12,25 +12,20 @@ riuso-software.rst ^D [ Div - ( "tree1" - , - [ "toctree", "foo", "bar" ] - , - [ - ( "caption", "Indice dei contenuti" ) - , - ( "numbered", "" ) - , - ( "maxdepth", "3" ) + ( "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" + ] ] - ) - [ 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 2a0ef086d..2b2ceb640 100644 --- a/test/command/4722.md +++ b/test/command/4722.md @@ -7,23 +7,16 @@ *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" ] ] + , [ 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" ] ] ] - , - [ Plain [ Str "Level", Space, Str "1" ] ] - ] ] ``` ``` @@ -35,25 +28,19 @@ #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" ] ] ] - ] + ( 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" ] ] ] - , - [ Plain [ Str "Level", Space, Str "1" ] ] - ] ] ``` diff --git a/test/command/4742.md b/test/command/4742.md index 45f42db5a..f3f4bf7ae 100644 --- a/test/command/4742.md +++ b/test/command/4742.md @@ -26,16 +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" + ] ] ``` @@ -45,15 +46,16 @@ 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 08c807c9f..582540736 100644 --- a/test/command/4743.md +++ b/test/command/4743.md @@ -5,15 +5,15 @@ Test that emojis are wrapped in Span 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" ] - ] + [ Str "My" + , Span + ( "" , [ "emoji" ] , [ ( "data-emoji" , "thumbsup" ) ] ) + [ Str "\128077" ] + , Str "emoji" + , Span + ( "" , [ "emoji" ] , [ ( "data-emoji" , "heart" ) ] ) + [ Str "\10084\65039" ] + ] ] ``` @@ -22,15 +22,15 @@ My:thumbsup:emoji:heart: 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" ] - ] + [ 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 59740373c..e240facf3 100644 --- a/test/command/4781.md +++ b/test/command/4781.md @@ -7,11 +7,17 @@ Markdown parsed *here* *But not here* ^D [ Para - [ Str "Markdown", Space, Str "parsed", Space, Emph [ Str "here" ] ] -, RawBlock - ( Format "tex" ) "\\include{command/bar}" + [ 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" ] ] + [ Emph + [ Str "But" , Space , Str "not" , Space , Str "here" ] + ] ] ``` @@ -22,13 +28,13 @@ Markdown parsed *here* *But not here* ^D [ Para - [ Emph - [ Str "here" ] - , Space - , RawInline - ( Format "tex" ) "\\input{command/bar}" - ] + [ Emph [ Str "here" ] + , Space + , RawInline (Format "tex") "\\input{command/bar}" + ] , Para - [ Emph [ Str "But", Space, Str "not", Space, Str "here" ] ] + [ Emph + [ Str "But" , Space , Str "not" , Space , Str "here" ] + ] ] ``` diff --git a/test/command/4811.md b/test/command/4811.md index 33d49f8c8..4c0b0faa9 100644 --- a/test/command/4811.md +++ b/test/command/4811.md @@ -6,7 +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: @@ -17,10 +17,8 @@ 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" ] ] ``` @@ -30,9 +28,10 @@ Backtick followed by alphanumeric doesn't end the span: `hi`there`:myrole: ^D [ Para - [ Code - ( "", [ "interpreted-text" ], [ ( "role", "myrole" ) ] ) "hi`there" - ] + [ Code + ( "" , [ "interpreted-text" ] , [ ( "role" , "myrole" ) ] ) + "hi`there" + ] ] ``` @@ -43,9 +42,10 @@ Newline is okay, as long as not blank: there`:myrole: ^D [ Para - [ Code - ( "", [ "interpreted-text" ], [ ( "role", "myrole" ) ] ) "hi\nthere" - ] + [ Code + ( "" , [ "interpreted-text" ] , [ ( "role" , "myrole" ) ] ) + "hi\nthere" + ] ] ``` @@ -54,5 +54,7 @@ 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 600266771..84db64b5f 100644 --- a/test/command/4817.md +++ b/test/command/4817.md @@ -6,16 +6,16 @@ foo: ... ^D Pandoc - ( Meta - { unMeta = fromList - [ - ( "foo" - , MetaList - [ MetaMap - ( fromList [ ( "bar", MetaInlines [ Str "bam" ] ) ] ) + Meta + { unMeta = + fromList + [ ( "foo" + , MetaList + [ MetaMap + (fromList [ ( "bar" , MetaInlines [ Str "bam" ] ) ]) + ] + ) ] - ) - ] } - ) [] + [] ``` diff --git a/test/command/4819.md b/test/command/4819.md index 5966b14f3..eb964efba 100644 --- a/test/command/4819.md +++ b/test/command/4819.md @@ -5,9 +5,10 @@ foo: 42 ... ^D Pandoc - ( Meta - { unMeta = fromList [ ( "foo", MetaInlines [ Str "42" ] ) ] } - ) [] + Meta + { unMeta = fromList [ ( "foo" , MetaInlines [ Str "42" ] ) ] + } + [] ``` ``` @@ -17,7 +18,7 @@ foo: true ... ^D Pandoc - ( Meta { unMeta = fromList [ ( "foo", MetaBool True ) ] } ) [] + Meta { unMeta = fromList [ ( "foo" , MetaBool True ) ] } [] ``` ``` @@ -27,7 +28,7 @@ foo: True ... ^D Pandoc - ( Meta { unMeta = fromList [ ( "foo", MetaBool True ) ] } ) [] + Meta { unMeta = fromList [ ( "foo" , MetaBool True ) ] } [] ``` ``` @@ -47,8 +48,9 @@ foo: no ... ^D Pandoc - ( Meta - { unMeta = fromList [ ( "foo", MetaInlines [ Str "no" ] ) ] } - ) [] + Meta + { unMeta = fromList [ ( "foo" , MetaInlines [ Str "no" ] ) ] + } + [] ``` diff --git a/test/command/4832.md b/test/command/4832.md index 6e8f9401e..5e9f2ac77 100644 --- a/test/command/4832.md +++ b/test/command/4832.md @@ -3,11 +3,11 @@ \url{http://example.com/foo%20bar.htm} ^D [ Para - [ Link - ( "", [], [] ) - [ Str "http://example.com/foo%20bar.htm" ] - ( "http://example.com/foo%20bar.htm", "" ) - ] + [ Link + ( "" , [] , [] ) + [ Str "http://example.com/foo%20bar.htm" ] + ( "http://example.com/foo%20bar.htm" , "" ) + ] ] ``` @@ -16,11 +16,11 @@ \url{http://example.com/foo{bar}.htm} ^D [ Para - [ Link - ( "", [], [] ) - [ Str "http://example.com/foo{bar}.htm" ] - ( "http://example.com/foo{bar}.htm", "" ) - ] + [ Link + ( "" , [] , [] ) + [ Str "http://example.com/foo{bar}.htm" ] + ( "http://example.com/foo{bar}.htm" , "" ) + ] ] ``` @@ -29,11 +29,11 @@ \href{http://example.com/foo%20bar}{Foobar} ^D [ Para - [ Link - ( "", [], [] ) - [ Str "Foobar" ] - ( "http://example.com/foo%20bar", "" ) - ] + [ Link + ( "" , [] , [] ) + [ Str "Foobar" ] + ( "http://example.com/foo%20bar" , "" ) + ] ] ``` diff --git a/test/command/4845.md b/test/command/4845.md index 092c48181..10d11127b 100644 --- a/test/command/4845.md +++ b/test/command/4845.md @@ -3,14 +3,19 @@ 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" - ] + [ 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 3110b90cc..54692ff09 100644 --- a/test/command/4848.md +++ b/test/command/4848.md @@ -10,9 +10,10 @@ \foreignquote{italian}{hi} ^D [ Para - [ Quoted DoubleQuote - [ Span ( "", [], [ ( "lang", "it" ) ] ) [ Str "hi" ] ] - ] + [ Quoted + DoubleQuote + [ Span ( "" , [] , [ ( "lang" , "it" ) ] ) [ Str "hi" ] ] + ] ] ``` @@ -21,9 +22,10 @@ \hyphenquote*{italian}{hi} ^D [ Para - [ Quoted SingleQuote - [ Span ( "", [], [ ( "lang", "it" ) ] ) [ Str "hi" ] ] - ] + [ Quoted + SingleQuote + [ Span ( "" , [] , [ ( "lang" , "it" ) ] ) [ Str "hi" ] ] + ] ] ``` @@ -33,12 +35,12 @@ Lorem ipsum \blockquote{dolor sit amet} consectetuer. ^D -[ Para - [ Str "Lorem", Space, Str "ipsum" ] +[ Para [ Str "Lorem" , Space , Str "ipsum" ] , BlockQuote - [ Para [ Str "dolor", Space, Str "sit", Space, Str "amet" ] ] -, Para - [ Str "consectetuer." ] + [ Para + [ Str "dolor" , Space , Str "sit" , Space , Str "amet" ] + ] +, Para [ Str "consectetuer." ] ] ``` @@ -78,15 +80,15 @@ Lorem ipsum \foreignblockquote{italian}{dolor sit amet} consectetuer. ^D -[ Para - [ Str "Lorem", Space, Str "ipsum" ] +[ Para [ Str "Lorem" , Space , Str "ipsum" ] , BlockQuote - [ Div - ( "", [], [ ( "lang", "it" ) ] ) - [ Para [ Str "dolor", Space, Str "sit", Space, Str "amet" ] ] - ] -, Para - [ Str "consectetuer." ] + [ 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 4fb0c9212..65b6bf65f 100644 --- a/test/command/4860.md +++ b/test/command/4860.md @@ -6,15 +6,15 @@ This is broken_. .. _broken: http://google.com ^D [ Para - [ Str "This" - , Space - , Str "is" - , Space - , Link - ( "", [], [] ) - [ Str "broken" ] - ( "http://google.com", "" ) - , Str "." - ] + [ 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 d442de3b4..ba8acd122 100644 --- a/test/command/4877.md +++ b/test/command/4877.md @@ -2,7 +2,9 @@ % 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}" ] +] ``` ``` diff --git a/test/command/4919.md b/test/command/4919.md index 165f427bb..b8f153848 100644 --- a/test/command/4919.md +++ b/test/command/4919.md @@ -8,8 +8,10 @@ V = \frac{K}{r^2} ^D [ Div - ( "tgtmath", [], [] ) - [ BlockQuote [ Para [ Math DisplayMath "V = \\frac{K}{r^2}" ] ] ] + ( "tgtmath" , [] , [] ) + [ BlockQuote + [ Para [ Math DisplayMath "V = \\frac{K}{r^2}" ] ] + ] ] ``` diff --git a/test/command/4928.md b/test/command/4928.md index c779fb0a4..b35e17d4f 100644 --- a/test/command/4928.md +++ b/test/command/4928.md @@ -3,31 +3,30 @@ \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}" + [ 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}" + ] ] - ] ] ``` @@ -36,31 +35,29 @@ \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}" + [ 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}" + ] ] - ] ] ``` @@ -69,31 +66,30 @@ \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}" + [ 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}" + ] ] - ] ] ``` @@ -102,31 +98,28 @@ \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}" + [ 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}" + ] ] - ] ] ``` @@ -168,22 +161,21 @@ \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}" + [ 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}" + ] ] - ] ] ``` @@ -192,35 +184,39 @@ \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}" + [ 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 "." + ] ] - , Str "." - ] ] - ] ] ``` diff --git a/test/command/4933.md b/test/command/4933.md index 763b49ca3..b8dedfa20 100644 --- a/test/command/4933.md +++ b/test/command/4933.md @@ -2,5 +2,9 @@ % 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 47965830c..8acc55750 100644 --- a/test/command/5014.md +++ b/test/command/5014.md @@ -14,34 +14,36 @@ </table> ^D [ Table - ( "", [], [] ) - ( Caption Nothing [] ) - [ ( AlignDefault, ColWidthDefault ) ] - ( TableHead - ( "", [], [] ) - [ Row - ( "", [], [] ) - [ Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "Name" ] ] - ] + ( "" , [] , [] ) + (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" ] ] + ] + ] ] - ) - [ TableBody - ( "", [], [] ) - ( RowHeadColumns 0 ) [] - [ Row - ( "", [], [] ) - [ Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "Accounts" ] ] - ] - ] - ] - ( TableFoot ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` diff --git a/test/command/5079.md b/test/command/5079.md index 28bdf64d0..3eb0628c5 100644 --- a/test/command/5079.md +++ b/test/command/5079.md @@ -11,23 +11,25 @@ </table> ^D [ Table - ( "", [], [] ) - ( Caption Nothing [] ) - [ ( AlignDefault, ColWidthDefault ) ] - ( TableHead ( "", [], [] ) [] ) - [ TableBody - ( "", [], [] ) - ( RowHeadColumns 0 ) [] - [ Row - ( "", [], [] ) - [ Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "Cell" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "Cell" ] ] + ] + ] ] - ] - ( TableFoot ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` diff --git a/test/command/5099.md b/test/command/5099.md index 316d021d9..d464f9c8a 100644 --- a/test/command/5099.md +++ b/test/command/5099.md @@ -3,19 +3,19 @@ (@citation ^D [ Para - [ Str "(" - , Cite - [ Citation - { citationId = "citation" - , citationPrefix = [] - , citationSuffix = [] - , citationMode = AuthorInText - , citationNoteNum = 1 - , citationHash = 0 - } + [ Str "(" + , Cite + [ Citation + { citationId = "citation" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "@citation" ] ] - [ Str "@citation" ] - ] ] ``` @@ -23,5 +23,7 @@ % 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 d74830b17..1c39b5071 100644 --- a/test/command/5178.md +++ b/test/command/5178.md @@ -23,19 +23,17 @@ unsafePerformIO main #+end_src ^D [ CodeBlock - ( "" - , - [ "commonlisp", "numberLines" ] - , - [ ( "org-language", "lisp" ), ( "startFrom", "20" ) ] - ) "(+ 1 1)\n" + ( "" + , [ "commonlisp" , "numberLines" ] + , [ ( "org-language" , "lisp" ) , ( "startFrom" , "20" ) ] + ) + "(+ 1 1)\n" , CodeBlock - ( "" - , - [ "commonlisp", "numberLines", "continuedSourceBlock" ] - , - [ ( "org-language", "lisp" ), ( "startFrom", "10" ) ] - ) "(+ 2 2)\n" + ( "" + , [ "commonlisp" , "numberLines" , "continuedSourceBlock" ] + , [ ( "org-language" , "lisp" ) , ( "startFrom" , "10" ) ] + ) + "(+ 2 2)\n" ] ``` diff --git a/test/command/5182.md b/test/command/5182.md index a26056a0e..5898f9edf 100644 --- a/test/command/5182.md +++ b/test/command/5182.md @@ -3,6 +3,7 @@ .. include:: command/5182.txt ^D [ CodeBlock - ( "", [ "python", "numberLines" ], [] ) "def func(x):\n return y" + ( "" , [ "python" , "numberLines" ] , [] ) + "def func(x):\n return y" ] ``` diff --git a/test/command/5271.md b/test/command/5271.md index e80bc3468..5df3958ef 100644 --- a/test/command/5271.md +++ b/test/command/5271.md @@ -8,34 +8,34 @@ abstract: | ... ^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." - ] + 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 ebad9374e..6c5b7f987 100644 --- a/test/command/5285.md +++ b/test/command/5285.md @@ -8,13 +8,10 @@ - b ^D [ BulletList - [ - [ Para [ Str "a" ], Para [ Str "b" ] ] - , - [ Para [ Str "a" ] ] - , - [ Para [ Str "b" ] ] - ] + [ [ Para [ Str "a" ] , Para [ Str "b" ] ] + , [ Para [ Str "a" ] ] + , [ Para [ Str "b" ] ] + ] ] ``` @@ -28,10 +25,8 @@ > foo ^D [ BulletList - [ - [ Para [ Str "foo" ], Para [ Str "foo" ] ] - , - [ Para [ Str "foo" ], BlockQuote [ Para [ Str "foo" ] ] ] - ] + [ [ 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 b0cfdb1b8..975852482 100644 --- a/test/command/5321.md +++ b/test/command/5321.md @@ -8,7 +8,9 @@ </fig> ^D [ Para - [ Image ( "fig-1", [], [] ) [ Str "bar" ] ( "foo.png", "fig:" ) ] + [ Image + ( "fig-1" , [] , [] ) [ Str "bar" ] ( "foo.png" , "fig:" ) + ] ] ``` @@ -23,10 +25,10 @@ </fig> ^D [ Para - [ Image - ( "fig-1", [], [] ) - [ Str "foo", LineBreak, Str "bar" ] - ( "foo.png", "fig:" ) - ] + [ Image + ( "fig-1" , [] , [] ) + [ Str "foo" , LineBreak , Str "bar" ] + ( "foo.png" , "fig:" ) + ] ] ``` diff --git a/test/command/5360.md b/test/command/5360.md index 7aa8adfa3..2250ba9f9 100644 --- a/test/command/5360.md +++ b/test/command/5360.md @@ -9,21 +9,14 @@ ::: ^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>" - ] + ( "" , [ "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 16cc4352c..e8b54bf7b 100644 --- a/test/command/5368.md +++ b/test/command/5368.md @@ -13,27 +13,26 @@ Quux. ^D [ OrderedList - ( 1, Decimal, Period ) - [ - [ Para - [ Str "foo" ] - , Para - [ Image ( "", [], [] ) [ Str "bar" ] ( "bar.png", "fig:" ) ] + ( 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 "foo2" ] - , Para - [ Image ( "", [], [] ) [ Str "bar2" ] ( "bar2.png", "fig:" ) ] - ] - , - [ Para - [ Str "foo3" ] - , Para - [ Image ( "", [], [] ) [ Str "foo3" ] ( "foo3.png", "fig:" ) ] - ] - ] -, Para - [ Str "Quux." ] +, Para [ Str "Quux." ] ] ``` diff --git a/test/command/5540.md b/test/command/5540.md index c5157e611..41239020e 100644 --- a/test/command/5540.md +++ b/test/command/5540.md @@ -5,10 +5,10 @@ Stay pure! \end{lstlisting} ^D [ CodeBlock - ( "" - , [ "myfunnylanguage" ] - , - [ ( "language", "myfunnylanguage" ) ] - ) "Stay pure!" + ( "" + , [ "myfunnylanguage" ] + , [ ( "language" , "myfunnylanguage" ) ] + ) + "Stay pure!" ] ``` diff --git a/test/command/5549.md b/test/command/5549.md index 4a17226ef..49d6f168f 100644 --- a/test/command/5549.md +++ b/test/command/5549.md @@ -4,5 +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 dbf82c822..0f612ea67 100644 --- a/test/command/5619.md +++ b/test/command/5619.md @@ -7,31 +7,31 @@ 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}" + [ 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:" ) ] - ( "img1.jpg", "fig:" ) - ] ] ``` diff --git a/test/command/5686.md b/test/command/5686.md index 445b732ed..d669ae49b 100644 --- a/test/command/5686.md +++ b/test/command/5686.md @@ -5,27 +5,27 @@ FOO\t0BAR This part does not make it to the html output. ^D [ Para - [ Str "FOO", RawInline ( Format "tex" ) "\\t0", Str "BAR" ] + [ 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." - ] + [ 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 ca8ab19fd..eae3663e5 100644 --- a/test/command/5700.md +++ b/test/command/5700.md @@ -2,39 +2,38 @@ % 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." + 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" + ] + ) ] - ) - , - ( "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 bb471a734..e97edcf30 100644 --- a/test/command/5708.md +++ b/test/command/5708.md @@ -5,32 +5,33 @@ +--------+----------------+ ^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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.125 ) + , ( AlignDefault , ColWidth 0.2361111111111111 ) ] - ] - ( TableFoot ( "", [], [] ) [] ) + (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 b7039dc91..131173079 100644 --- a/test/command/5711.md +++ b/test/command/5711.md @@ -8,23 +8,25 @@ \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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) ] + (TableHead ( "" , [] , [] ) []) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "d" , LineBreak , Str "e" ] ] + ] + ] ] - ] - ( TableFoot ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` diff --git a/test/command/5714.md b/test/command/5714.md index a38ec2384..c874f1af7 100644 --- a/test/command/5714.md +++ b/test/command/5714.md @@ -6,15 +6,11 @@ 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 d40eb8a41..686c8f495 100644 --- a/test/command/5753.md +++ b/test/command/5753.md @@ -11,8 +11,9 @@ end ^D [ Para - [ Math DisplayMath "q_3\n+ 4", Math DisplayMath "- 5 +\nq_5" ] -, Para - [ Str "end" ] + [ 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 d62588d6d..8271e1232 100644 --- a/test/command/5795.md +++ b/test/command/5795.md @@ -10,10 +10,10 @@ <dfn class="dfn" id="foo" title="bax"><span>foo</span></dfn> ^D [ Plain - [ Span - ( "foo", [ "dfn", "dfn" ], [ ( "title", "bax" ) ] ) - [ Span ( "", [], [] ) [ Str "foo" ] ] - ] + [ Span + ( "foo" , [ "dfn" , "dfn" ] , [ ( "title" , "bax" ) ] ) + [ Span ( "" , [] , [] ) [ Str "foo" ] ] + ] ] ``` diff --git a/test/command/5797.md b/test/command/5797.md index c85c76aaf..4be51c629 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 f08dca96b..03c72bd75 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 d551740b1..aac73cf47 100644 --- a/test/command/5845.md +++ b/test/command/5845.md @@ -12,19 +12,14 @@ 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" ] + [ 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 f3259d8fa..06ff29b76 100644 --- a/test/command/5878.md +++ b/test/command/5878.md @@ -4,14 +4,12 @@ Zozime^[], Synésius^[] ^D [ Para - [ Str "Zozime" - , Note - [ Para [] ] - , Str "," - , SoftBreak - , Str "Syn\233sius" - , Note - [ 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 c3000af47..b2785dd36 100644 --- a/test/command/6009.md +++ b/test/command/6009.md @@ -9,17 +9,11 @@ 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 f900a5295..ae3bfb45c 100644 --- a/test/command/6026.md +++ b/test/command/6026.md @@ -5,32 +5,32 @@ @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 - } + [ Cite + [ Citation + { citationId = "https://openreview.net/forum?id=HkwoSDPgg" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "@https://openreview.net/forum?id=HkwoSDPgg" ] ] - [ Str "@https://openreview.net/forum?id=HkwoSDPgg" ] - ] , Para - [ Cite - [ Citation - { citationId = "https://openreview.net/forum?id" - , citationPrefix = [] - , citationSuffix = [] - , citationMode = AuthorInText - , citationNoteNum = 2 - , citationHash = 0 - } + [ Cite + [ Citation + { citationId = "https://openreview.net/forum?id" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 2 + , citationHash = 0 + } + ] + [ Str "@https://openreview.net/forum?id" ] + , Str "=HkwoSDPgg" ] - [ Str "@https://openreview.net/forum?id" ] - , Str "=HkwoSDPgg" - ] ] ``` ``` diff --git a/test/command/6034.md b/test/command/6034.md index 3abf85455..eb8999d11 100644 --- a/test/command/6034.md +++ b/test/command/6034.md @@ -8,6 +8,7 @@ \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*}" + (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 9af798b6b..83d2869bb 100644 --- a/test/command/6114.md +++ b/test/command/6114.md @@ -4,10 +4,10 @@ {pic_M87star.pdf} ^D [ Para - [ Image - ( "", [], [ ( "width", ".85\\textwidth" ) ] ) - [ Str "image" ] - ( "pic_M87star.pdf", "" ) - ] + [ Image + ( "" , [] , [ ( "width" , ".85\\textwidth" ) ] ) + [ Str "image" ] + ( "pic_M87star.pdf" , "" ) + ] ] ``` diff --git a/test/command/6137.md b/test/command/6137.md index d6cd34b92..a58b4876f 100644 --- a/test/command/6137.md +++ b/test/command/6137.md @@ -16,136 +16,142 @@ This reference to Figure \ref{fig:label} works fine. \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 ) + [ 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." ] - ( 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" ] ] +, 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 ) ] - , 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" ] ] + (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 ( "" , [] , [] ) []) ] - ( 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" + [ Str "This" , Space - , Str "numbered" + , Str "reference" , Space - , Str "caption," + , Str "to" , Space - , Str "if" + , Str "Figure" , Space - , Str "I" + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "fig:label" ) + ] + ) + [ Str "1" ] + ( "#fig:label" , "" ) , Space - , Str "use" + , Str "works" , Space - , Str "pandoc-crossref." + , 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:" ) ] - ( "example.png", "fig:" ) - ] ] ``` diff --git a/test/command/6288.md b/test/command/6288.md index 5314499e0..042e0a72e 100644 --- a/test/command/6288.md +++ b/test/command/6288.md @@ -4,5 +4,7 @@ <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 758312766..51a22480c 100644 --- a/test/command/6324.md +++ b/test/command/6324.md @@ -13,13 +13,14 @@ Me \end{document} ^D Pandoc - ( Meta - { unMeta = fromList - [ - ( "author", MetaList [ MetaInlines [ Str "Me" ] ] ) - , - ( "title", MetaInlines [ Str "Document", Space, Str "title" ] ) - ] + 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 3f0f129e4..6dfea4ded 100644 --- a/test/command/6699.md +++ b/test/command/6699.md @@ -7,11 +7,9 @@ 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 7ed5225ab..419895000 100644 --- a/test/command/6709.md +++ b/test/command/6709.md @@ -7,5 +7,7 @@ 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 1f9e29cf5..23701c066 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 a515007a1..c35c04eb3 100644 --- a/test/command/6791.md +++ b/test/command/6791.md @@ -15,28 +15,33 @@ </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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidth 0.25 ) + , ( AlignDefault , ColWidth 0.25 ) ] - ] - ( TableFoot ( "", [], [] ) [] ) + (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 342d173a6..5e66c1d1b 100644 --- a/test/command/6802.md +++ b/test/command/6802.md @@ -2,6 +2,7 @@ % 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 8c89ee0d2..b8e668a62 100644 --- a/test/command/6836.md +++ b/test/command/6836.md @@ -9,35 +9,33 @@ See @foo. [@buchanan] ^D [ Para - [ Cite - [ Citation - { citationId = "buchanan" - , citationPrefix = [] - , citationSuffix = [] - , citationMode = NormalCitation - , citationNoteNum = 1 - , citationHash = 0 - } + [ Cite + [ Citation + { citationId = "buchanan" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "[@buchanan]" ] ] - [ Str "[@buchanan]" ] - ] -, OrderedList - ( 1, Example, TwoParens ) [ [] ] +, OrderedList ( 1 , Example , TwoParens ) [ [] ] +, Para [ Str "See" , Space , Str "1." ] , Para - [ Str "See", Space, Str "1." ] -, Para - [ Cite - [ Citation - { citationId = "buchanan" - , citationPrefix = [] - , citationSuffix = [] - , citationMode = NormalCitation - , citationNoteNum = 2 - , citationHash = 0 - } + [ Cite + [ Citation + { citationId = "buchanan" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 2 + , citationHash = 0 + } + ] + [ Str "[@buchanan]" ] ] - [ Str "[@buchanan]" ] - ] ] ``` diff --git a/test/command/6869.md b/test/command/6869.md index 6e195e944..cbef00f68 100644 --- a/test/command/6869.md +++ b/test/command/6869.md @@ -3,18 +3,17 @@ \cite[„Aber“]{key} ^D [ Para - [ Cite - [ Citation - { citationId = "key" - , citationPrefix = [] - , citationSuffix = - [ Str "\8222Aber\8220" ] - , citationMode = NormalCitation - , citationNoteNum = 0 - , citationHash = 0 - } + [ Cite + [ Citation + { citationId = "key" + , citationPrefix = [] + , citationSuffix = [ Str "\8222Aber\8220" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [ RawInline (Format "latex") "\\cite[\8222Aber\8220]{key}" ] ] - [ RawInline ( Format "latex" ) "\\cite[\8222Aber\8220]{key}" ] - ] ] ``` diff --git a/test/command/6873.md b/test/command/6873.md index f2d47b5ad..20667d64c 100644 --- a/test/command/6873.md +++ b/test/command/6873.md @@ -4,37 +4,32 @@ ^D [WARNING] Citeproc: citation key not found [ Para - [ Cite - [ Citation - { citationId = "key" - , citationPrefix = [] - , citationSuffix = - [ Str "\8222Etwas" + [ 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 "]" ] + , Span ( "" , [] , [] ) [ Str "]" ] , Space - , Str "auslassen\8220" + , 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 71f53bb13..579342980 100644 --- a/test/command/6890.md +++ b/test/command/6890.md @@ -28,42 +28,15 @@ 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 + [ Cite [ Citation - { citationId = "fruchtel-sozialer-2013a" - , citationPrefix = [] - , citationSuffix = [] - , citationMode = AuthorInText - , citationNoteNum = 2 - , citationHash = 0 - } + { citationId = "fruchtel-sozialer-2013a" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 1 + , citationHash = 0 + } ] [ Str "Fr\252chtel," , Space @@ -75,65 +48,95 @@ Some text.[^1] , 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" + ( "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." + ] ] - , 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 17a7056e2..d2baa2748 100644 --- a/test/command/6993.md +++ b/test/command/6993.md @@ -2,20 +2,32 @@ % 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 4f5e18c70..5f88a58a6 100644 --- a/test/command/7003.md +++ b/test/command/7003.md @@ -30,21 +30,29 @@ This a Foo section \lstinputlisting{example.tex} \end{document} ^D -[ Header 1 - ( "with-lstlisting-environment", [], [] ) - [ Str "With", Space, Str "lstlisting", Space, Str "environment" ] +[ 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" ] + ( "" , [] , [] ) + "\\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}" + ( "" , [ "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 3f17c6d46..565a6544d 100644 --- a/test/command/7080.md +++ b/test/command/7080.md @@ -5,9 +5,13 @@ [image]: image.png width=100px height=150px ^D [ Para - [ Image - ( "", [], [ ( "width", "100px" ), ( "height", "150px" ) ] ) [] - ( "image.png", "" ) - ] + [ Image + ( "" + , [] + , [ ( "width" , "100px" ) , ( "height" , "150px" ) ] + ) + [] + ( "image.png" , "" ) + ] ] ``` diff --git a/test/command/7092.md b/test/command/7092.md index 0c1d1ae8c..d6a526392 100644 --- a/test/command/7092.md +++ b/test/command/7092.md @@ -4,5 +4,7 @@ \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 caabc99a3..14005f0d1 100644 --- a/test/command/7129.md +++ b/test/command/7129.md @@ -6,44 +6,50 @@ \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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) ] - ) - [ TableBody - ( "", [], [] ) - ( RowHeadColumns 0 ) [] - [ Row - ( "", [], [] ) - [ Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "foo" ] ] - , Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Code ( "", [], [] ) "b&r" ] ] - ] + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` diff --git a/test/command/7134.md b/test/command/7134.md index 24980fabb..041d7ea24 100644 --- a/test/command/7134.md +++ b/test/command/7134.md @@ -9,43 +9,43 @@ 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." + , Str "paragraph." ] - ] , 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 "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 21310ccdf..623f40880 100644 --- a/test/command/7145.md +++ b/test/command/7145.md @@ -9,67 +9,64 @@ 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" ] + [ 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." ] - , 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 5e26e4469..454c387d5 100644 --- a/test/command/7155.md +++ b/test/command/7155.md @@ -4,14 +4,14 @@ \\(x\\) \\[x\\] ^D [ Para - [ Math InlineMath "x" - , Space - , Math DisplayMath "x" - , SoftBreak - , Str "\\(x\\)" - , Space - , Str "\\[x\\]" - ] + [ Math InlineMath "x" + , Space + , Math DisplayMath "x" + , SoftBreak + , Str "\\(x\\)" + , Space + , Str "\\[x\\]" + ] ] ``` @@ -21,13 +21,13 @@ \\(x\\) \\[x\\] ^D [ Para - [ Str "(x)" - , Space - , Str "[x]" - , SoftBreak - , Math InlineMath "x" - , Space - , Math DisplayMath "x" - ] + [ 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 31bfc7f1c..f8d004f68 100644 --- a/test/command/7339.md +++ b/test/command/7339.md @@ -7,8 +7,9 @@ title: Test Hi ^D Pandoc - ( Meta - { unMeta = fromList [ ( "title", MetaInlines [ Str "Test" ] ) ] } - ) + Meta + { unMeta = + fromList [ ( "title" , MetaInlines [ Str "Test" ] ) ] + } [ Para [ Str "Hi" ] ] ``` diff --git a/test/command/7400.md b/test/command/7400.md index d93c203b2..785ded88d 100644 --- a/test/command/7400.md +++ b/test/command/7400.md @@ -4,6 +4,5 @@ # Comment only ... ^D -Pandoc - ( Meta { unMeta = fromList [] } ) [] +Pandoc Meta { unMeta = fromList [] } [] ``` diff --git a/test/command/7434.md b/test/command/7434.md index 61740f8fe..e4f2743a1 100644 --- a/test/command/7434.md +++ b/test/command/7434.md @@ -10,14 +10,14 @@ [\*\a](x) ^D [ RawBlock - ( Format "tex" ) "\\begin{proof}\n\\newcommand{\\x}{\\left.\\right.}\n\\left.\\right.\n\\end{proof}" + (Format "tex") + "\\begin{proof}\n\\newcommand{\\x}{\\left.\\right.}\n\\left.\\right.\n\\end{proof}" +, Para [ Str "1234567890abcdefghi" ] , Para - [ Str "1234567890abcdefghi" ] -, Para - [ Link - ( "", [], [] ) - [ Str "*", RawInline ( Format "tex" ) "\\a" ] - ( "x", "" ) - ] + [ Link + ( "" , [] , [] ) + [ Str "*" , RawInline (Format "tex") "\\a" ] + ( "x" , "" ) + ] ] ``` diff --git a/test/command/7436.md b/test/command/7436.md index 3e1829ca8..c2d434d60 100644 --- a/test/command/7436.md +++ b/test/command/7436.md @@ -9,25 +9,23 @@ .. include:: command/three.txt ^D [ CodeBlock - ( "", [ "" ], [ ( "code", "" ) ] ) "1st line.\n2nd line.\n3rd line.\n" + ( "" , [ "" ] , [ ( "code" , "" ) ] ) + "1st line.\n2nd line.\n3rd line.\n" , CodeBlock - ( "" - , [ "" ] - , - [ ( "literal", "" ) ] - ) "1st line.\n2nd line.\n3rd line.\n" + ( "" , [ "" ] , [ ( "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." - ] + [ 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 910761c7e..c837d0b3c 100644 --- a/test/command/7557.md +++ b/test/command/7557.md @@ -3,19 +3,18 @@ - 11. and 12. 09. meeting ^D [ BulletList - [ - [ Plain - [ Str "11." - , Space - , Str "and" - , Space - , Str "12." - , Space - , Str "09." - , Space - , Str "meeting" + [ [ Plain + [ Str "11." + , Space + , Str "and" + , Space + , Str "12." + , Space + , Str "09." + , Space + , Str "meeting" + ] ] ] - ] ] ``` diff --git a/test/command/7589.md b/test/command/7589.md index f9e8fb14f..aff21dad8 100644 --- a/test/command/7589.md +++ b/test/command/7589.md @@ -15,59 +15,58 @@ </table> ^D [ Table - ( "", [], [] ) - ( Caption Nothing [] ) - [ - ( AlignDefault, ColWidthDefault ) - , - ( AlignDefault, ColWidthDefault ) - , - ( AlignDefault, ColWidthDefault ) - , - ( AlignDefault, ColWidthDefault ) - , - ( AlignDefault, ColWidthDefault ) - , - ( AlignDefault, ColWidthDefault ) - ] - ( TableHead - ( "", [], [] ) - [ Row - ( "", [], [] ) - [ Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "experience" ] ] - , Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "expertise" ] ] - , Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "paradigms" ] ] - , Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "haskell" ] ] - , Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "name" ] ] - , Cell - ( "", [], [] ) AlignDefault - ( RowSpan 1 ) - ( ColSpan 1 ) - [ Plain [ Str "image" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) ] - ) - [ TableBody ( "", [], [] ) ( RowHeadColumns 0 ) [] [] ] - ( TableFoot ( "", [], [] ) [] ) + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "experience" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "expertise" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "paradigms" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "haskell" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "name" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "image" ] ] + ] + ]) + [ TableBody ( "" , [] , [] ) (RowHeadColumns 0) [] [] ] + (TableFoot ( "" , [] , [] ) []) ] ``` diff --git a/test/command/934.md b/test/command/934.md index 195d5602e..3c86a1f26 100644 --- a/test/command/934.md +++ b/test/command/934.md @@ -8,36 +8,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" - ] + [ 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" + [ Strong + [ Str "And" + , Space + , Str "this" + , Space + , Str "is" + , Space + , Str "the" + , Space + , Str "attribution" + ] ] - ] ] ``` diff --git a/test/command/adjacent_latex_blocks.md b/test/command/adjacent_latex_blocks.md index 3d3334424..4483d6e3f 100644 --- a/test/command/adjacent_latex_blocks.md +++ b/test/command/adjacent_latex_blocks.md @@ -4,9 +4,7 @@ \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 409e389b9..aa61b93e8 100644 --- a/test/command/cite-in-inline-note.md +++ b/test/command/cite-in-inline-note.md @@ -3,24 +3,24 @@ 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 "foo" + , Note + [ Para + [ Str "bar" + , Space + , Cite + [ Citation + { citationId = "doe" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = NormalCitation + , citationNoteNum = 1 + , citationHash = 0 + } + ] + [ Str "[@doe]" ] + ] ] - [ Str "[@doe]" ] - ] ] - ] ] ``` diff --git a/test/command/citeproc-author-in-text-suffix.md b/test/command/citeproc-author-in-text-suffix.md index 4e511fd1b..df3184aa8 100644 --- a/test/command/citeproc-author-in-text-suffix.md +++ b/test/command/citeproc-author-in-text-suffix.md @@ -3,26 +3,32 @@ @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 - } + [ 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]" + ] ] - [ Str "@a", Space, Str "[p.", Space, Str "33;", Space, Str "@b]" ] - ] ] ``` diff --git a/test/command/csv.md b/test/command/csv.md index d1d92d43e..353512553 100644 --- a/test/command/csv.md +++ b/test/command/csv.md @@ -6,94 +6,97 @@ Apple,25 cents,33 ,,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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) ] - ) - [ 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" ] ] - ] + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` diff --git a/test/command/docbook-bibliography.md b/test/command/docbook-bibliography.md index 2709bddd3..6e42732ad 100644 --- a/test/command/docbook-bibliography.md +++ b/test/command/docbook-bibliography.md @@ -13,35 +13,33 @@ </bibliomixed> </bibliodiv> ^D -[ Header 1 - ( "", [], [] ) - [ Str "Document", Space, Str "References" ] +[ Header + 1 + ( "" , [] , [] ) + [ Str "Document" , Space , Str "References" ] , Para - [ Span - ( "refTheFirst", [], [] ) [] - , Str "[1]" - , Space - , Str "First" - , Space - , Str "reference" - ] + [ Span ( "refTheFirst" , [] , [] ) [] + , Str "[1]" + , Space + , Str "First" + , Space + , Str "reference" + ] , Para - [ Span - ( "refTheSecond", [], [] ) [] - , Str "[2]" - , Space - , Str "Second" - , Space - , Str "reference" - ] + [ Span ( "refTheSecond" , [] , [] ) [] + , Str "[2]" + , Space + , Str "Second" + , Space + , Str "reference" + ] , Para - [ Span - ( "refTheThird", [], [] ) [] - , Str "[3]" - , Space - , Str "Third" - , Space - , Str "reference" - ] + [ Span ( "refTheThird" , [] , [] ) [] + , Str "[3]" + , Space + , Str "Third" + , Space + , Str "reference" + ] ] ``` diff --git a/test/command/dots.md b/test/command/dots.md index c98a67026..cd9a978cf 100644 --- a/test/command/dots.md +++ b/test/command/dots.md @@ -6,5 +6,8 @@ \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 1f7c73fae..6efbab9cd 100644 --- a/test/command/empty_paragraphs.md +++ b/test/command/empty_paragraphs.md @@ -2,28 +2,32 @@ % 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" ] +] ``` ``` @@ -51,7 +55,11 @@ <p></p> <p>lo</p> ^D -[ Para [ Str "hi" ], Para [], Para [], Para [ Str "lo" ] ] +[ Para [ Str "hi" ] +, Para [] +, Para [] +, Para [ Str "lo" ] +] ``` ``` @@ -61,7 +69,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 9822b993d..78736b2d6 100644 --- a/test/command/gfm.md +++ b/test/command/gfm.md @@ -8,58 +8,66 @@ gfm tests: | 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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignRight , ColWidthDefault ) ] - ) - [ 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" ] ] - ] + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` @@ -67,7 +75,8 @@ gfm tests: % pandoc -f gfm -t native ~~stricken out~~ ^D -[ Para [ Strikeout [ Str "stricken", Space, Str "out" ] ] ] +[ Para [ Strikeout [ Str "stricken" , Space , Str "out" ] ] +] ``` ``` @@ -76,15 +85,10 @@ 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" ] ] ``` @@ -93,15 +97,15 @@ gfm tests: 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" ] - ] + [ Str "My" + , Span + ( "" , [ "emoji" ] , [ ( "data-emoji" , "thumbsup" ) ] ) + [ Str "\128077" ] + , Str "emoji" + , Span + ( "" , [ "emoji" ] , [ ( "data-emoji" , "heart" ) ] ) + [ Str "\10084\65039" ] + ] ] ``` @@ -180,7 +184,7 @@ The caption. hi hi ^D -[ Para [ Str "hi", LineBreak, Str "hi" ] ] +[ Para [ Str "hi" , LineBreak , Str "hi" ] ] ``` ``` @@ -189,11 +193,9 @@ hi - [x] bar ^D [ BulletList - [ - [ Plain [ Str "\9744", Space, Str "foo" ] ] - , - [ Plain [ Str "\9746", Space, Str "bar" ] ] - ] + [ [ Plain [ Str "\9744" , Space , Str "foo" ] ] + , [ Plain [ Str "\9746" , Space , Str "bar" ] ] + ] ] ``` @@ -203,11 +205,10 @@ hi - [x] bar ^D [ BulletList - [ - [ Plain [ Str "[", Space, Str "]", Space, Str "foo" ] ] - , - [ Plain [ Str "[x]", Space, Str "bar" ] ] - ] + [ [ 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 8e2d19d8b..c011f17fc 100644 --- a/test/command/hspace.md +++ b/test/command/hspace.md @@ -9,7 +9,8 @@ Here they need to be inline: \end{figure} ^D [ RawBlock - ( Format "tex" ) "\\begin{figure}\n\\includegraphics{lalune.jpg}\n\\caption{lalune \\hspace{2em} \\vspace{1em} bloo}\n\\end{figure}" + (Format "tex") + "\\begin{figure}\n\\includegraphics{lalune.jpg}\n\\caption{lalune \\hspace{2em} \\vspace{1em} bloo}\n\\end{figure}" ] ``` @@ -35,7 +36,8 @@ 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}" + (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}" ] ``` @@ -44,7 +46,10 @@ F & F &\\ hi\hspace{1em}there ^D [ Para - [ Str "hi", RawInline ( Format "tex" ) "\\hspace{1em}", Str "there" ] + [ Str "hi" + , RawInline (Format "tex") "\\hspace{1em}" + , Str "there" + ] ] ``` @@ -56,11 +61,8 @@ 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 5b40c8b0d..dd9c8d9d9 100644 --- a/test/command/html-read-figure.md +++ b/test/command/html-read-figure.md @@ -6,7 +6,9 @@ </figure> ^D [ Para - [ Image ( "", [], [] ) [ Str "bar" ] ( "foo.png", "fig:voyage" ) ] + [ Image + ( "" , [] , [] ) [ Str "bar" ] ( "foo.png" , "fig:voyage" ) + ] ] ``` @@ -28,7 +30,9 @@ <img src="foo.png" title="voyage"> </figure> ^D -[ Para [ Image ( "", [], [] ) [] ( "foo.png", "fig:voyage" ) ] ] +[ Para + [ Image ( "" , [] , [] ) [] ( "foo.png" , "fig:voyage" ) ] +] ``` ``` @@ -39,7 +43,9 @@ </figure> ^D [ Para - [ Image ( "", [], [] ) [ Str "bar" ] ( "foo.png", "fig:voyage" ) ] + [ Image + ( "" , [] , [] ) [ Str "bar" ] ( "foo.png" , "fig:voyage" ) + ] ] ``` @@ -48,10 +54,10 @@ <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" ) - ] + [ 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 6733cdd77..d2b019996 100644 --- a/test/command/html-trim-definition-list-terms.md +++ b/test/command/html-trim-definition-list-terms.md @@ -12,12 +12,14 @@ </dl> ^D [ DefinitionList - [ - ( - [ Str "foo", SoftBreak, Str "bar", LineBreak, Str "baz" ] - , - [ [ Plain [ Str "test" ] ] ] - ) - ] + [ ( [ Str "foo" + , SoftBreak + , Str "bar" + , LineBreak + , Str "baz" + ] + , [ [ Plain [ Str "test" ] ] ] + ) + ] ] ``` diff --git a/test/command/hyphenat.md b/test/command/hyphenat.md index e584e1608..ca418c111 100644 --- a/test/command/hyphenat.md +++ b/test/command/hyphenat.md @@ -30,7 +30,9 @@ C\colonhyp\bshyp{}Windows\bshyp % pandoc -f latex -t native \nohyphens{Pneumonoultramicroscopicsilicovolcanoconiosis} ^D -[ Para [ Str "Pneumonoultramicroscopicsilicovolcanoconiosis" ] ] +[ Para + [ Str "Pneumonoultramicroscopicsilicovolcanoconiosis" ] +] ``` ``` @@ -38,9 +40,10 @@ C\colonhyp\bshyp{}Windows\bshyp \textnhtt{Pneumonoultramicroscopicsilicovolcanoconiosis} ^D [ Para - [ Code - ( "", [], [] ) "Pneumonoultramicroscopicsilicovolcanoconiosis" - ] + [ Code + ( "" , [] , [] ) + "Pneumonoultramicroscopicsilicovolcanoconiosis" + ] ] ``` @@ -49,9 +52,10 @@ C\colonhyp\bshyp{}Windows\bshyp \nhttfamily{Pneumonoultramicroscopicsilicovolcanoconiosis} ^D [ Para - [ Code - ( "", [], [] ) "Pneumonoultramicroscopicsilicovolcanoconiosis" - ] + [ Code + ( "" , [] , [] ) + "Pneumonoultramicroscopicsilicovolcanoconiosis" + ] ] ``` diff --git a/test/command/ifstrequal.md b/test/command/ifstrequal.md index 6ced0f016..92fe6bf95 100644 --- a/test/command/ifstrequal.md +++ b/test/command/ifstrequal.md @@ -6,6 +6,11 @@ \h{b} ^D [ Para - [ Emph [ Str "no" ], SoftBreak, Str "\225", SoftBreak, Str "b" ] + [ Emph [ Str "no" ] + , SoftBreak + , Str "\225" + , SoftBreak + , Str "b" + ] ] ``` diff --git a/test/command/indented-fences.md b/test/command/indented-fences.md index 302c54621..12aade1a7 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,7 @@ 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 b97950d31..55d298bc4 100644 --- a/test/command/input-with-endinput.md +++ b/test/command/input-with-endinput.md @@ -8,11 +8,8 @@ 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 71e4fbabc..078a58068 100644 --- a/test/command/latex-center.md +++ b/test/command/latex-center.md @@ -7,6 +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 ad24528ec..a1f2c3f2a 100644 --- a/test/command/latex-color.md +++ b/test/command/latex-color.md @@ -5,12 +5,11 @@ Hello \textcolor{red}{World} ^D [ Para - [ Str "Hello" - , Space - , Span - ( "", [], [ ( "style", "color: red" ) ] ) - [ Str "World" ] - ] + [ Str "Hello" + , Space + , Span + ( "" , [] , [ ( "style" , "color: red" ) ] ) [ Str "World" ] + ] ] ``` @@ -19,12 +18,11 @@ Hello \textcolor{red}{World} \textcolor{red}{Hello} World ^D [ Para - [ Span - ( "", [], [ ( "style", "color: red" ) ] ) - [ Str "Hello" ] - , Space - , Str "World" - ] + [ Span + ( "" , [] , [ ( "style" , "color: red" ) ] ) [ Str "Hello" ] + , Space + , Str "World" + ] ] ``` @@ -33,12 +31,12 @@ Hello \textcolor{red}{World} Hello \textcolor{blue}{\textbf{World}} ^D [ Para - [ Str "Hello" - , Space - , Span - ( "", [], [ ( "style", "color: blue" ) ] ) - [ Strong [ Str "World" ] ] - ] + [ Str "Hello" + , Space + , Span + ( "" , [] , [ ( "style" , "color: blue" ) ] ) + [ Strong [ Str "World" ] ] + ] ] ``` @@ -48,13 +46,13 @@ Hello \textcolor{blue}{\textbf{World}} Hello \textcolor{blue}{\textbf{World}}. ^D [ Para - [ Str "Hello" - , Space - , Span - ( "", [], [ ( "style", "color: blue" ) ] ) - [ Strong [ Str "World" ] ] - , Str "." - ] + [ Str "Hello" + , Space + , Span + ( "" , [] , [ ( "style" , "color: blue" ) ] ) + [ Strong [ Str "World" ] ] + , Str "." + ] ] ``` @@ -68,14 +66,12 @@ Hello \textcolor{blue}{\textbf{World}}. } ^D [ Div - ( "", [], [ ( "style", "color: orange" ) ] ) - [ BulletList - [ - [ Para [ Str "Item", Space, Str "1" ] ] - , - [ Para [ Str "Item", Space, Str "2" ] ] + ( "" , [] , [ ( "style" , "color: orange" ) ] ) + [ BulletList + [ [ Para [ Str "Item" , Space , Str "1" ] ] + , [ Para [ Str "Item" , Space , Str "2" ] ] + ] ] - ] ] ``` @@ -110,12 +106,12 @@ Hello \textcolor{blue}{\textbf{World}}. Hello \colorbox{red}{World} ^D [ Para - [ Str "Hello" - , Space - , Span - ( "", [], [ ( "style", "background-color: red" ) ] ) - [ Str "World" ] - ] + [ Str "Hello" + , Space + , Span + ( "" , [] , [ ( "style" , "background-color: red" ) ] ) + [ Str "World" ] + ] ] ``` @@ -138,12 +134,12 @@ Hello \colorbox{red}{World} Hello \colorbox{blue}{\textbf{World}} ^D [ Para - [ Str "Hello" - , Space - , Span - ( "", [], [ ( "style", "background-color: blue" ) ] ) - [ Strong [ Str "World" ] ] - ] + [ Str "Hello" + , Space + , Span + ( "" , [] , [ ( "style" , "background-color: blue" ) ] ) + [ Strong [ Str "World" ] ] + ] ] ``` @@ -152,13 +148,13 @@ Hello \colorbox{blue}{\textbf{World}} Hello \colorbox{blue}{\textbf{World}}. ^D [ Para - [ Str "Hello" - , Space - , Span - ( "", [], [ ( "style", "background-color: blue" ) ] ) - [ Strong [ Str "World" ] ] - , Str "." - ] + [ Str "Hello" + , Space + , Span + ( "" , [] , [ ( "style" , "background-color: blue" ) ] ) + [ Strong [ Str "World" ] ] + , Str "." + ] ] ``` @@ -174,14 +170,12 @@ Hello \colorbox{blue}{\textbf{World}}. } ^D [ Div - ( "", [], [ ( "style", "background-color: orange" ) ] ) - [ BulletList - [ - [ Para [ Str "Item", Space, Str "1" ] ] - , - [ Para [ Str "Item", Space, Str "2" ] ] + ( "" , [] , [ ( "style" , "background-color: orange" ) ] ) + [ BulletList + [ [ Para [ Str "Item" , Space , Str "1" ] ] + , [ Para [ Str "Item" , Space , Str "2" ] ] + ] ] - ] ] ``` @@ -197,15 +191,13 @@ Hello \colorbox{blue}{\textbf{World}}. } some more text ^D [ Div - ( "", [], [ ( "style", "background-color: blue" ) ] ) - [ BulletList - [ - [ Para [ Str "Item", Space, Str "1" ] ] - , - [ Para [ Str "Item", Space, Str "2" ] ] + ( "" , [] , [ ( "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" ] + [ Str "some" , Space , Str "more" , Space , Str "text" ] ] ``` diff --git a/test/command/latex-fontawesome.md b/test/command/latex-fontawesome.md index e67ed1792..18512ac72 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 a6b820262..586fed3d1 100644 --- a/test/command/latex-tabular-column-specs.md +++ b/test/command/latex-tabular-column-specs.md @@ -12,78 +12,84 @@ f & 0.5 & 5,5 \\ \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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) + , ( AlignLeft , ColWidthDefault ) ] - ) - [ 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" ] ] - ] + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` diff --git a/test/command/lettrine.md b/test/command/lettrine.md index 522e9b2ca..b4a2794d2 100644 --- a/test/command/lettrine.md +++ b/test/command/lettrine.md @@ -5,22 +5,16 @@ \lettrine[lhang=0.17]{A}{category} is ^D [ Para - [ Span - ( "", [ "lettrine" ], [] ) - [ Str "A" ] - , SmallCaps - [ Str "category" ] - , Space - , Str "is" - ] + [ Span ( "" , [ "lettrine" ] , [] ) [ Str "A" ] + , SmallCaps [ Str "category" ] + , Space + , Str "is" + ] , Para - [ Span - ( "", [ "lettrine" ], [] ) - [ Str "A" ] - , SmallCaps - [ Str "category" ] - , Space - , Str "is" - ] + [ Span ( "" , [ "lettrine" ] , [] ) [ Str "A" ] + , SmallCaps [ Str "category" ] + , Space + , Str "is" + ] ] ``` diff --git a/test/command/lstlisting.md b/test/command/lstlisting.md index 202a9d524..2ea8b4ba7 100644 --- a/test/command/lstlisting.md +++ b/test/command/lstlisting.md @@ -9,17 +9,14 @@ 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}" + ( "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}" ] ``` @@ -34,18 +31,14 @@ 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}" + ( "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 57aa2cb04..7bd72d140 100644 --- a/test/command/macro-defs-in-preamble.md +++ b/test/command/macro-defs-in-preamble.md @@ -10,12 +10,9 @@ $\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" ] + 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 75b34c08d..a3ee6af30 100644 --- a/test/command/md-abbrevs.md +++ b/test/command/md-abbrevs.md @@ -15,6 +15,7 @@ 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 d20eecc1f..e117f3784 100644 --- a/test/command/multiple-metadata-blocks.md +++ b/test/command/multiple-metadata-blocks.md @@ -11,7 +11,9 @@ foo: bim ... ^D Pandoc - ( Meta - { unMeta = fromList [ ( "foo", MetaInlines [ Str "bim" ] ) ] } - ) [] + Meta + { unMeta = + fromList [ ( "foo" , MetaInlines [ Str "bim" ] ) ] + } + [] ``` diff --git a/test/command/refs.md b/test/command/refs.md index 165177175..d89e745ff 100644 --- a/test/command/refs.md +++ b/test/command/refs.md @@ -3,17 +3,18 @@ Figure \ref{fig:1} ^D [ Para - [ Str "Figure" - , Space - , Link - ( "" - , [] - , - [ ( "reference-type", "ref" ), ( "reference", "fig:1" ) ] - ) - [ Str "[fig:1]" ] - ( "#fig:1", "" ) - ] + [ Str "Figure" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "fig:1" ) + ] + ) + [ Str "[fig:1]" ] + ( "#fig:1" , "" ) + ] ] ``` @@ -22,17 +23,18 @@ Figure \ref{fig:1} Figure \cref{fig:1} ^D [ Para - [ Str "Figure" - , Space - , Link - ( "" - , [] - , - [ ( "reference-type", "ref" ), ( "reference", "fig:1" ) ] - ) - [ Str "[fig:1]" ] - ( "#fig:1", "" ) - ] + [ Str "Figure" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "fig:1" ) + ] + ) + [ Str "[fig:1]" ] + ( "#fig:1" , "" ) + ] ] ``` @@ -41,17 +43,18 @@ Figure \cref{fig:1} Figure \vref{fig:1} ^D [ Para - [ Str "Figure" - , Space - , Link - ( "" - , [] - , - [ ( "reference-type", "ref+page" ), ( "reference", "fig:1" ) ] - ) - [ Str "[fig:1]" ] - ( "#fig:1", "" ) - ] + [ Str "Figure" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref+page" ) + , ( "reference" , "fig:1" ) + ] + ) + [ Str "[fig:1]" ] + ( "#fig:1" , "" ) + ] ] ``` @@ -65,36 +68,40 @@ Accuracy~\eqref{eq:Accuracy} is the proportion, measuring true results among all \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." - ] + [ 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}" ] + [ Math + DisplayMath + "\\label{eq:Accuracy}\n Accuracy = \\frac{t_p + t_n}{t_p + f_p + f_n + t_n}" + ] ] ``` @@ -168,93 +175,90 @@ Figure \ref{fig:Logo2} illustrated the SVG logo Figure \ref{fig:Logo3} illustrated the SVG logo ^D -[ Header 1 - ( "one", [], [] ) - [ Str "One" ] +[ Header 1 ( "one" , [] , [] ) [ Str "One" ] , Para - [ Image - ( "fig:Logo", [], [] ) - [ Str "Logo" ] - ( "command/SVG_logo.svg", "fig:" ) - ] + [ 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" ] + [ 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:" ) - ] + [ 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" - ] + [ 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" - ] + [ 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" - ] + [ 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" + ] ] ``` @@ -264,20 +268,21 @@ Figure \ref{fig:Logo3} illustrated the SVG logo \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", "" ) - ] + [ 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 7be49e4a7..3494cbf70 100644 --- a/test/command/setext-fenced-div.md +++ b/test/command/setext-fenced-div.md @@ -4,5 +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 8397e7092..1ce966989 100644 --- a/test/command/shift-heading-level-by.md +++ b/test/command/shift-heading-level-by.md @@ -9,17 +9,19 @@ title: My title ## Second ^D Pandoc - ( Meta - { unMeta = fromList - [ ( "title", MetaInlines [ Str "My", Space, Str "title" ] ) ] + Meta + { unMeta = + fromList + [ ( "title" + , MetaInlines [ Str "My" , Space , Str "title" ] + ) + ] } - ) - [ Header 2 - ( "first-heading", [], [] ) - [ Str "First", Space, Str "heading" ] - , Header 3 - ( "second", [], [] ) - [ Str "Second" ] + [ Header + 2 + ( "first-heading" , [] , [] ) + [ Str "First" , Space , Str "heading" ] + , Header 3 ( "second" , [] , [] ) [ Str "Second" ] ] ``` @@ -36,16 +38,22 @@ title: Old title # Another top-level heading ^D Pandoc - ( Meta - { unMeta = fromList - [ ( "title", MetaInlines [ Str "First", Space, Str "heading" ] ) ] + Meta + { unMeta = + fromList + [ ( "title" + , MetaInlines [ Str "First" , Space , Str "heading" ] + ) + ] } - ) - [ Header 1 - ( "second", [], [] ) - [ Str "Second" ] + [ Header 1 ( "second" , [] , [] ) [ Str "Second" ] , Para - [ Str "Another", Space, Str "top-level", Space, Str "heading" ] + [ Str "Another" + , Space + , Str "top-level" + , Space + , Str "heading" + ] ] ``` diff --git a/test/command/sloppypar.md b/test/command/sloppypar.md index 3ac62bf79..44ec93af3 100644 --- a/test/command/sloppypar.md +++ b/test/command/sloppypar.md @@ -7,109 +7,109 @@ Qui et temporibus explicabo. Esse ab ut quidem. Vel qui perspiciatis quae odio c \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." - ] + [ 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." - ] + [ 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." + ] ] ``` @@ -122,108 +122,108 @@ Qui et temporibus explicabo. Esse ab ut quidem. Vel qui perspiciatis quae odio c \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." - ] + [ 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." - ] + [ 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 9b6e311bd..ccf119cbd 100644 --- a/test/command/table-with-cell-align.md +++ b/test/command/table-with-cell-align.md @@ -14,47 +14,48 @@ </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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) + , ( AlignDefault , ColWidthDefault ) ] - ] - ( TableFoot ( "", [], [] ) [] ) + (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 ( "" , [] , [] ) []) ] ``` ``` diff --git a/test/command/table-with-column-span.md b/test/command/table-with-column-span.md index 592e6d3da..d4e8bebd4 100644 --- a/test/command/table-with-column-span.md +++ b/test/command/table-with-column-span.md @@ -50,161 +50,180 @@ </informaltable> ^D [ 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" ] ] + ( "" , [] , [] ) + (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" ] ] + ] ] - ] - , 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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` ``` diff --git a/test/command/tabularx.md b/test/command/tabularx.md index a5056f518..399741732 100644 --- a/test/command/tabularx.md +++ b/test/command/tabularx.md @@ -21,97 +21,127 @@ \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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) ] - ) - [ 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" ] ] - ] + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` @@ -138,97 +168,127 @@ \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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidthDefault ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignLeft , ColWidth 0.25 ) ] - ) - [ 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" ] ] - ] + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` @@ -255,96 +315,126 @@ \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" ] ] - ] + ( "" , [] , [] ) + (Caption Nothing []) + [ ( AlignLeft , ColWidth 0.25 ) + , ( AlignCenter , ColWidthDefault ) + , ( AlignLeft , ColWidth 0.25 ) ] - ) - [ 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" ] ] - ] + (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 ( "", [], [] ) [] ) + (TableFoot ( "" , [] , [] ) []) ] ``` diff --git a/test/command/translations.md b/test/command/translations.md index 26d683860..8d1890467 100644 --- a/test/command/translations.md +++ b/test/command/translations.md @@ -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 45c7e0dd3..4a3f10b85 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 f782ffe59..d483618d3 100644 --- a/test/command/yaml-metadata-blocks.md +++ b/test/command/yaml-metadata-blocks.md @@ -7,9 +7,9 @@ foo: --- ^D Pandoc - ( Meta - { unMeta = fromList [ ( "foo", MetaMap ( fromList [] ) ) ] } - ) [] + Meta + { unMeta = fromList [ ( "foo" , MetaMap (fromList []) ) ] } + [] ``` ``` % pandoc -s -t native @@ -35,46 +35,31 @@ nested: --- ^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" ] ) - ] + 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 @@ -85,20 +70,19 @@ array: --- ^D Pandoc - ( Meta - { unMeta = fromList - [ - ( "array" - , MetaList - [ MetaMap - ( fromList [ ( "foo", MetaInlines [ Str "bar" ] ) ] ) - , MetaMap - ( fromList [ ( "bool", MetaBool True ) ] ) + 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 @@ -107,33 +91,31 @@ title: document --- ^D Pandoc - ( Meta - { unMeta = fromList - [ - ( "other" - , MetaInlines - [ Emph [ Str "markdown" ], Space, Str "value" ] - ) - , - ( "title", MetaInlines [ Str "document" ] ) - ] + 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" ) - ] + 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 94a736ab5..98cc76e18 100644 --- a/test/command/yaml-with-chomp.md +++ b/test/command/yaml-with-chomp.md @@ -8,14 +8,13 @@ ml: |- ... ^D Pandoc - ( Meta - { unMeta = fromList - [ - ( "ml" - , MetaBlocks - [ Para [ Str "TEST" ], Plain [ Str "BLOCK" ] ] - ) - ] + Meta + { unMeta = + fromList + [ ( "ml" + , MetaBlocks [ Para [ Str "TEST" ] , Plain [ Str "BLOCK" ] ] + ) + ] } - ) [] + [] ``` |