From c266734448544a118ed80e47deaa2590131c7f84 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 19 Sep 2021 12:09:51 -0700 Subject: Use pretty-simple to format native output. Previously we used our own homespun formatting. But this produces over-long lines that aren't ideal for diffs in tests. Easier to use something off-the-shelf and standard. Closes #7580. Performance is slower by about a factor of 10, but this isn't really a problem because native isn't suitable as a serialization format. (For serialization you should use json, because the reader is so much faster than native.) --- test/command/csv.md | 129 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 91 insertions(+), 38 deletions(-) (limited to 'test/command/csv.md') diff --git a/test/command/csv.md b/test/command/csv.md index 75dccf1a7..d1d92d43e 100644 --- a/test/command/csv.md +++ b/test/command/csv.md @@ -5,42 +5,95 @@ Apple,25 cents,33 """Navel"" Orange","35 cents",22 ,,45 ^D -[Table ("",[],[]) (Caption Nothing - []) - [(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault) - ,(AlignDefault,ColWidthDefault)] - (TableHead ("",[],[]) - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Fruit"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Price"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Quantity"]]]]) - [(TableBody ("",[],[]) (RowHeadColumns 0) - [] - [Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "Apple"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "25",Space,Str "cents"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "33"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "\"Navel\"",Space,Str "Orange"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "35",Space,Str "cents"]] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "22"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [] - ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1) - [Plain [Str "45"]]]])] - (TableFoot ("",[],[]) - [])] +[ Table + ( "", [], [] ) + ( Caption Nothing [] ) + [ + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + , + ( AlignDefault, ColWidthDefault ) + ] + ( TableHead + ( "", [], [] ) + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Fruit" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Price" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Quantity" ] ] + ] + ] + ) + [ TableBody + ( "", [], [] ) + ( RowHeadColumns 0 ) [] + [ Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "Apple" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "25", Space, Str "cents" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "33" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "\"Navel\"", Space, Str "Orange" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "35", Space, Str "cents" ] ] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "22" ] ] + ] + , Row + ( "", [], [] ) + [ Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) [] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) [] + , Cell + ( "", [], [] ) AlignDefault + ( RowSpan 1 ) + ( ColSpan 1 ) + [ Plain [ Str "45" ] ] + ] + ] + ] + ( TableFoot ( "", [], [] ) [] ) +] ``` -- cgit v1.2.3