From 0bdcf415e4eff83ad8e35c1d41c8a28e0bbd5da1 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 28 Sep 2021 21:17:53 -0700 Subject: 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. --- test/command/4928.md | 274 +++++++++++++++++++++++++-------------------------- 1 file changed, 135 insertions(+), 139 deletions(-) (limited to 'test/command/4928.md') 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 "." - ] ] - ] ] ``` -- cgit v1.2.3