diff options
author | John MacFarlane <jgm@berkeley.edu> | 2021-09-29 08:28:54 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2021-09-29 08:28:54 -0700 |
commit | 92abe458638d9824725ef8c70eb3613f5cc89217 (patch) | |
tree | 0a5367659f22d07270981ac521223d56e5582771 /test | |
parent | 0bdcf415e4eff83ad8e35c1d41c8a28e0bbd5da1 (diff) | |
download | pandoc-92abe458638d9824725ef8c70eb3613f5cc89217.tar.gz |
Further test updates for switch to pretty-show.
Diffstat (limited to 'test')
-rw-r--r-- | test/command/3123.md | 2 | ||||
-rw-r--r-- | test/command/3537.md | 8 | ||||
-rw-r--r-- | test/command/3587.md | 24 | ||||
-rw-r--r-- | test/command/3983.md | 6 | ||||
-rw-r--r-- | test/command/4183.md | 2 | ||||
-rw-r--r-- | test/command/4742.md | 21 | ||||
-rw-r--r-- | test/command/4819.md | 3 | ||||
-rw-r--r-- | test/command/4848.md | 36 | ||||
-rw-r--r-- | test/command/4928.md | 47 | ||||
-rw-r--r-- | test/command/html-read-figure.md | 4 | ||||
-rw-r--r-- | test/command/latex-color.md | 26 | ||||
-rw-r--r-- | test/command/refs.md | 49 |
12 files changed, 114 insertions, 114 deletions
diff --git a/test/command/3123.md b/test/command/3123.md index 14f207e39..a97165bc8 100644 --- a/test/command/3123.md +++ b/test/command/3123.md @@ -2,7 +2,7 @@ % pandoc -f markdown -t native <?php echo "1" ; ?> ^D -[ RawBlock ( Format "html" ) "<?php echo \"1\" ; ?>" ] +[ RawBlock (Format "html") "<?php echo \"1\" ; ?>" ] ``` ``` diff --git a/test/command/3537.md b/test/command/3537.md index 98704c930..3f4445343 100644 --- a/test/command/3537.md +++ b/test/command/3537.md @@ -14,7 +14,13 @@ foo bar % pandoc -t native Hi `there`{=ms}. ^D -[ Para [ Str "Hi", Space, RawInline ( Format "ms" ) "there", Str "." ] ] +[ Para + [ Str "Hi" + , Space + , RawInline (Format "ms") "there" + , Str "." + ] +] ```` ```` diff --git a/test/command/3587.md b/test/command/3587.md index 88f009900..0a3c389b9 100644 --- a/test/command/3587.md +++ b/test/command/3587.md @@ -122,13 +122,11 @@ \SIrange{10}{20}{\cubic\meter} ^D [ Para - [ Str "10\160m" - , Superscript - [ Str "3" ] - , Str "\8211\&20\160m" - , Superscript - [ Str "3" ] - ] + [ Str "10\160m" + , Superscript [ Str "3" ] + , Str "\8211\&20\160m" + , Superscript [ Str "3" ] + ] ] ``` @@ -164,13 +162,11 @@ \SIrange{10}{20}{\meter\cubed} ^D [ Para - [ Str "10\160m" - , Superscript - [ Str "3" ] - , Str "\8211\&20\160m" - , Superscript - [ Str "3" ] - ] + [ Str "10\160m" + , Superscript [ Str "3" ] + , Str "\8211\&20\160m" + , Superscript [ Str "3" ] + ] ] ``` diff --git a/test/command/3983.md b/test/command/3983.md index c13aea850..82c1deef0 100644 --- a/test/command/3983.md +++ b/test/command/3983.md @@ -5,10 +5,8 @@ \graphicspath\expandafter{\expandafter{\filename@area}}% \makeatother ^D -[ RawBlock - ( Format "latex" ) "\\makeatletter" -, RawBlock - ( Format "latex" ) "\\makeatother" +[ RawBlock (Format "latex") "\\makeatletter" +, RawBlock (Format "latex") "\\makeatother" ] ``` diff --git a/test/command/4183.md b/test/command/4183.md index 0fa940a63..8d6c65a01 100644 --- a/test/command/4183.md +++ b/test/command/4183.md @@ -4,7 +4,7 @@ <img src="foo" alt="bar"> </figure> ^D -[ Para [ Image ( "", [], [] ) [] ( "foo", "fig:" ) ] ] +[ Para [ Image ( "" , [] , [] ) [] ( "foo" , "fig:" ) ] ] ``` ``` diff --git a/test/command/4742.md b/test/command/4742.md index f3f4bf7ae..a91dffb33 100644 --- a/test/command/4742.md +++ b/test/command/4742.md @@ -5,16 +5,17 @@ extension properly. % pandoc -f commonmark+gfm_auto_identifiers+ascii_identifiers -t native # non ascii ⚠️ räksmörgås ^D -[ Header 1 - ( "non-ascii--raksmorgas", [], [] ) - [ Str "non" - , Space - , Str "ascii" - , Space - , Str "\9888\65039" - , Space - , Str "r\228ksm\246rg\229s" - ] +[ Header + 1 + ( "non-ascii--raksmorgas" , [] , [] ) + [ Str "non" + , Space + , Str "ascii" + , Space + , Str "\9888\65039" + , Space + , Str "r\228ksm\246rg\229s" + ] ] ``` diff --git a/test/command/4819.md b/test/command/4819.md index eb964efba..c7cd9a90a 100644 --- a/test/command/4819.md +++ b/test/command/4819.md @@ -38,7 +38,8 @@ foo: FALSE ... ^D Pandoc - ( Meta { unMeta = fromList [ ( "foo", MetaBool False ) ] } ) [] + Meta { unMeta = fromList [ ( "foo" , MetaBool False ) ] } + [] ``` ``` diff --git a/test/command/4848.md b/test/command/4848.md index 54692ff09..c73699a3c 100644 --- a/test/command/4848.md +++ b/test/command/4848.md @@ -50,27 +50,25 @@ Lorem ipsum \blockcquote[198]{Knu86}{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 - [ Cite - [ Citation - { citationId = "Knu86" - , citationPrefix = [] - , citationSuffix = - [ Str "198" ] - , citationMode = NormalCitation - , citationNoteNum = 0 - , citationHash = 0 - } - ] [] + [ Para + [ Str "dolor" , Space , Str "sit" , Space , Str "amet" ] + , Para + [ Cite + [ Citation + { citationId = "Knu86" + , citationPrefix = [] + , citationSuffix = [ Str "198" ] + , citationMode = NormalCitation + , citationNoteNum = 0 + , citationHash = 0 + } + ] + [] + ] ] - ] -, Para - [ Str "consectetuer." ] +, Para [ Str "consectetuer." ] ] ``` diff --git a/test/command/4928.md b/test/command/4928.md index b35e17d4f..86699aab5 100644 --- a/test/command/4928.md +++ b/test/command/4928.md @@ -128,31 +128,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}" + ] ] - ] ] ``` diff --git a/test/command/html-read-figure.md b/test/command/html-read-figure.md index dd9c8d9d9..d7eb96bb4 100644 --- a/test/command/html-read-figure.md +++ b/test/command/html-read-figure.md @@ -20,7 +20,9 @@ </figure> ^D [ Para - [ Image ( "", [], [] ) [ Str "bar" ] ( "foo.png", "fig:voyage" ) ] + [ Image + ( "" , [] , [] ) [ Str "bar" ] ( "foo.png" , "fig:voyage" ) + ] ] ``` diff --git a/test/command/latex-color.md b/test/command/latex-color.md index a1f2c3f2a..97d7f84c0 100644 --- a/test/command/latex-color.md +++ b/test/command/latex-color.md @@ -85,16 +85,14 @@ Hello \textcolor{blue}{\textbf{World}}. } some more text ^D [ Div - ( "", [], [ ( "style", "color: blue" ) ] ) - [ BulletList - [ - [ Para [ Str "Item", Space, Str "1" ] ] - , - [ Para [ Str "Item", Space, Str "2" ] ] + ( "" , [] , [ ( "style" , "color: blue" ) ] ) + [ BulletList + [ [ Para [ Str "Item" , Space , Str "1" ] ] + , [ Para [ Str "Item" , Space , Str "2" ] ] + ] ] - ] , Para - [ Str "some", Space, Str "more", Space, Str "text" ] + [ Str "some" , Space , Str "more" , Space , Str "text" ] ] ``` @@ -120,12 +118,12 @@ Hello \colorbox{red}{World} \colorbox{red}{Hello} World ^D [ Para - [ Span - ( "", [], [ ( "style", "background-color: red" ) ] ) - [ Str "Hello" ] - , Space - , Str "World" - ] + [ Span + ( "" , [] , [ ( "style" , "background-color: red" ) ] ) + [ Str "Hello" ] + , Space + , Str "World" + ] ] ``` diff --git a/test/command/refs.md b/test/command/refs.md index d89e745ff..fb362febe 100644 --- a/test/command/refs.md +++ b/test/command/refs.md @@ -116,31 +116,32 @@ Accuracy~\eqref{eq:Accuracy} is the proportion, measuring true results among all Figure \ref{fig:Logo} illustrated the SVG logo ^D [ Para - [ Image - ( "fig:Logo", [], [] ) - [ Str "Logo" ] - ( "command/SVG_logo.svg", "fig:" ) - ] + [ Image + ( "fig:Logo" , [] , [] ) + [ Str "Logo" ] + ( "command/SVG_logo.svg" , "fig:" ) + ] , Para - [ Str "Figure" - , Space - , Link - ( "" - , [] - , - [ ( "reference-type", "ref" ), ( "reference", "fig:Logo" ) ] - ) - [ Str "1" ] - ( "#fig:Logo", "" ) - , Space - , Str "illustrated" - , Space - , Str "the" - , Space - , Str "SVG" - , Space - , Str "logo" - ] + [ Str "Figure" + , Space + , Link + ( "" + , [] + , [ ( "reference-type" , "ref" ) + , ( "reference" , "fig:Logo" ) + ] + ) + [ Str "1" ] + ( "#fig:Logo" , "" ) + , Space + , Str "illustrated" + , Space + , Str "the" + , Space + , Str "SVG" + , Space + , Str "logo" + ] ] ``` |