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/ipynb/simple.out.native | 183 +++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 93 deletions(-) (limited to 'test/ipynb') diff --git a/test/ipynb/simple.out.native b/test/ipynb/simple.out.native index 43b170a3a..0f243ca48 100644 --- a/test/ipynb/simple.out.native +++ b/test/ipynb/simple.out.native @@ -1,106 +1,103 @@ Pandoc - ( Meta - { unMeta = fromList - [ - ( "jupyter" - , MetaMap - ( fromList - [ - ( "nbformat", MetaString "4" ) - , - ( "nbformat_minor", MetaString "5" ) - ] - ) - ) - ] + Meta + { unMeta = + fromList + [ ( "jupyter" + , MetaMap + (fromList + [ ( "nbformat" , MetaString "4" ) + , ( "nbformat_minor" , MetaString "5" ) + ]) + ) + ] } - ) [ Div - ( "", [ "cell", "markdown" ], [] ) - [ Header 1 - ( "lorem-ipsum", [], [] ) - [ Str "Lorem", Space, Str "ipsum" ] - , Para - [ Strong - [ Str "Lorem", Space, Str "ipsum" ] - , Space - , Str "dolor" - , Space - , Str "sit" - , Space - , Str "amet," - , Space - , Str "consectetur" - , Space - , Str "adipiscing" - , Space - , Str "elit." - , Space - , Str "Nunc" - , Space - , Str "luctus" - , SoftBreak - , Str "bibendum" - , Space - , Str "felis" - , Space - , Str "dictum" - , Space - , Str "sodales." + ( "" , [ "cell" , "markdown" ] , [] ) + [ Header + 1 + ( "lorem-ipsum" , [] , [] ) + [ Str "Lorem" , Space , Str "ipsum" ] + , Para + [ Strong [ Str "Lorem" , Space , Str "ipsum" ] + , Space + , Str "dolor" + , Space + , Str "sit" + , Space + , Str "amet," + , Space + , Str "consectetur" + , Space + , Str "adipiscing" + , Space + , Str "elit." + , Space + , Str "Nunc" + , Space + , Str "luctus" + , SoftBreak + , Str "bibendum" + , Space + , Str "felis" + , Space + , Str "dictum" + , Space + , Str "sodales." + ] ] - ] , Div - ( "", [ "cell", "code" ], [] ) - [ CodeBlock ( "", [ "python" ], [] ) "print(\"hello\")" ] + ( "" , [ "cell" , "code" ] , [] ) + [ CodeBlock ( "" , [ "python" ] , [] ) "print(\"hello\")" ] , Div - ( "", [ "cell", "markdown" ], [] ) - [ Header 2 ( "pyout", [], [] ) [ Str "Pyout" ] ] + ( "" , [ "cell" , "markdown" ] , [] ) + [ Header 2 ( "pyout" , [] , [] ) [ Str "Pyout" ] ] , Div - ( "", [ "cell", "code" ], [ ( "execution_count", "2" ) ] ) - [ CodeBlock - ( "" - , [ "python" ] - , [] - ) "from IPython.display import HTML\nHTML(\"\"\"\n\nHTML\n\"\"\")" - , Div ( "" - , - [ "output", "execute_result" ] - , - [ ( "execution_count", "2" ) ] + , [ "cell" , "code" ] + , [ ( "execution_count" , "2" ) ] ) - [ RawBlock - ( Format "html" ) "\nHTML\nhello" + [ CodeBlock + ( "" , [ "python" ] , [] ) + "from IPython.display import HTML\nHTML(\"\"\"\n\nHTML\n\"\"\")" + , Div + ( "" + , [ "output" , "execute_result" ] + , [ ( "execution_count" , "2" ) ] + ) + [ RawBlock + (Format "html") + "\nHTML\nhello" + ] ] - ] , Div - ( "", [ "cell", "markdown" ], [ ( "tags", "[\"foo\",\"bar\"]" ) ] ) - [ Header 2 - ( "image", [], [] ) - [ Str "Image" ] - , Para - [ Str "This" - , Space - , Str "image" - , Space - , Image - ( "", [], [] ) - [ Str "the", Space, Str "moon" ] - ( "lalune.jpg", "" ) - , Space - , Str "will" - , Space - , Str "be" - , Space - , Str "included" - , Space - , Str "as" - , Space - , Str "a" - , Space - , Str "cell" - , SoftBreak - , Str "attachment." + ( "" + , [ "cell" , "markdown" ] + , [ ( "tags" , "[\"foo\",\"bar\"]" ) ] + ) + [ Header 2 ( "image" , [] , [] ) [ Str "Image" ] + , Para + [ Str "This" + , Space + , Str "image" + , Space + , Image + ( "" , [] , [] ) + [ Str "the" , Space , Str "moon" ] + ( "lalune.jpg" , "" ) + , Space + , Str "will" + , Space + , Str "be" + , Space + , Str "included" + , Space + , Str "as" + , Space + , Str "a" + , Space + , Str "cell" + , SoftBreak + , Str "attachment." + ] ] - ] ] -- cgit v1.2.3