Updated tests for new native format.

1 files changed, 49 insertions, 52 deletions

diff --git a/tests/markdown-reader-more.native b/tests/markdown-reader-more.native
index fdd589c1e..ce093b9fa 100644
--- a/tests/markdown-reader-more.native
+++ b/tests/markdown-reader-more.native
@@ -1,52 +1,49 @@
-Pandoc (Meta {docTitle = [Str "Title",Space,Str "spanning",Space,Str "multiple",Space,Str "lines"], docAuthors = [[Str "Author",Space,Str "One"],[Str "Author",Space,Str "Two"],[Str "Author",Space,Str "Three"],[Str "Author",Space,Str "Four"]], docDate = []})
-[ Header 1 [Str "Additional",Space,Str "markdown",Space,Str "reader",Space,Str "tests"]
-, Header 2 [Str "Blank",Space,Str "line",Space,Str "before",Space,Str "URL",Space,Str "in",Space,Str "link",Space,Str "reference"]
-, Para [Link [Str "foo"] ("/url",""),Space,Str "and",Space,Link [Str "bar"] ("/url","title")]
-, Header 2 [Str "Raw",Space,Str "ConTeXt",Space,Str "environments"]
-, Para [TeX "\\placeformula",Space,TeX "\\startformula\n   L_{1} = L_{2}\n   \\stopformula"]
-, Para [TeX "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"]
-, Header 2 [Str "URLs",Space,Str "with",Space,Str "spaces"]
-, Para [Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("bar%20baz","title")]
-, Para [Link [Str "baz"] ("/foo%20foo",""),Space,Link [Str "bam"] ("/foo%20fee",""),Space,Link [Str "bork"] ("/foo/zee%20zob","title")]
-, Header 2 [Str "Horizontal",Space,Str "rules",Space,Str "with",Space,Str "spaces",Space,Str "at",Space,Str "end"]
-, HorizontalRule
-, HorizontalRule
-, Header 2 [Str "Raw",Space,Str "HTML",Space,Str "before",Space,Str "header"]
-, Plain [HtmlInline "<a>",HtmlInline "</a>"]
-, Header 3 [Str "my",Space,Str "header"]
-, Header 2 [Str "$",Space,Str "in",Space,Str "math"]
-, Para [Math InlineMath "\\$2 + \\$3"]
-, Header 2 [Str "Commented",Str "-",Str "out",Space,Str "list",Space,Str "item"]
-, BulletList
-  [ [ Plain [Str "one",Space,HtmlInline "<!--\n- two\n-->"] ]
-  , [ Plain [Str "three"] ] ]
-, Header 2 [Str "Backslash",Space,Str "newline"]
-, Para [Str "hi",LineBreak,Str "there"]
-, Header 2 [Str "Code",Space,Str "spans"]
-, Para [Code "hi\\"]
-, Para [Code "hi there"]
-, Para [Code "hi````there"]
-, Para [Str "`",Str "hi"]
-, Para [Str "there",Str "`"]
-, Header 2 [Str "Multilingual",Space,Str "URLs"]
-, Para [Link [Code "http://\27979.com?\27979=\27979"] ("http://%E6%B5%8B.com?%E6%B5%8B=%E6%B5%8B","")]
-, Para [Link [Str "foo"] ("/bar/%E6%B5%8B?x=%E6%B5%8B","title")]
-, Para [Link [Code "\27979@foo.\27979.baz"] ("mailto:%E6%B5%8B@foo.%E6%B5%8B.baz","")]
-, Header 2 [Str "Numbered",Space,Str "examples"]
-, OrderedList (1,Example,TwoParens)
-  [ [ Plain [Str "First",Space,Str "example",Str "."] ]
-  , [ Plain [Str "Second",Space,Str "example",Str "."] ] ]
-, Para [Str "Explanation",Space,Str "of",Space,Str "examples",Space,Str "(",Str "2",Str ")",Space,Str "and",Space,Str "(",Str "3",Str ")",Str "."]
-, OrderedList (3,Example,TwoParens)
-  [ [ Plain [Str "Third",Space,Str "example",Str "."] ]
- ]
-, Header 2 [Str "Macros"]
-, Para [Math InlineMath "\\langle x,y \\rangle"]
-, Header 2 [Str "Case",Str "-",Str "insensitive",Space,Str "references"]
-, Para [Link [Str "Fum"] ("/fum","")]
-, Para [Link [Str "FUM"] ("/fum","")]
-, Para [Link [Str "bat"] ("/bat","")]
-, Header 2 [Str "Curly",Space,Str "smart",Space,Str "quotes"]
-, Para [Quoted DoubleQuote [Str "Hi"]]
-, Para [Quoted SingleQuote [Str "Hi"]] ]
-
+[Header 1 [Str "Additional",Space,Str "markdown",Space,Str "reader",Space,Str "tests"]
+,Header 2 [Str "Blank",Space,Str "line",Space,Str "before",Space,Str "URL",Space,Str "in",Space,Str "link",Space,Str "reference"]
+,Para [Link [Str "foo"] ("/url",""),Space,Str "and",Space,Link [Str "bar"] ("/url","title")]
+,Header 2 [Str "Raw",Space,Str "ConTeXt",Space,Str "environments"]
+,Para [TeX "\\placeformula",Space,TeX "\\startformula\n   L_{1} = L_{2}\n   \\stopformula"]
+,Para [TeX "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"]
+,Header 2 [Str "URLs",Space,Str "with",Space,Str "spaces"]
+,Para [Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("bar%20baz","title")]
+,Para [Link [Str "baz"] ("/foo%20foo",""),Space,Link [Str "bam"] ("/foo%20fee",""),Space,Link [Str "bork"] ("/foo/zee%20zob","title")]
+,Header 2 [Str "Horizontal",Space,Str "rules",Space,Str "with",Space,Str "spaces",Space,Str "at",Space,Str "end"]
+,HorizontalRule
+,HorizontalRule
+,Header 2 [Str "Raw",Space,Str "HTML",Space,Str "before",Space,Str "header"]
+,Plain [HtmlInline "<a>",HtmlInline "</a>"]
+,Header 3 [Str "my",Space,Str "header"]
+,Header 2 [Str "$",Space,Str "in",Space,Str "math"]
+,Para [Math InlineMath "\\$2 + \\$3"]
+,Header 2 [Str "Commented",Str "-",Str "out",Space,Str "list",Space,Str "item"]
+,BulletList
+ [[Plain [Str "one",Space,HtmlInline "<!--\n- two\n-->"]]
+ ,[Plain [Str "three"]]]
+,Header 2 [Str "Backslash",Space,Str "newline"]
+,Para [Str "hi",LineBreak,Str "there"]
+,Header 2 [Str "Code",Space,Str "spans"]
+,Para [Code "hi\\"]
+,Para [Code "hi there"]
+,Para [Code "hi````there"]
+,Para [Str "`",Str "hi"]
+,Para [Str "there",Str "`"]
+,Header 2 [Str "Multilingual",Space,Str "URLs"]
+,Para [Link [Code "http://\27979.com?\27979=\27979"] ("http://%E6%B5%8B.com?%E6%B5%8B=%E6%B5%8B","")]
+,Para [Link [Str "foo"] ("/bar/%E6%B5%8B?x=%E6%B5%8B","title")]
+,Para [Link [Code "\27979@foo.\27979.baz"] ("mailto:%E6%B5%8B@foo.%E6%B5%8B.baz","")]
+,Header 2 [Str "Numbered",Space,Str "examples"]
+,OrderedList (1,Example,TwoParens)
+ [[Plain [Str "First",Space,Str "example",Str "."]]
+ ,[Plain [Str "Second",Space,Str "example",Str "."]]]
+,Para [Str "Explanation",Space,Str "of",Space,Str "examples",Space,Str "(",Str "2",Str ")",Space,Str "and",Space,Str "(",Str "3",Str ")",Str "."]
+,OrderedList (3,Example,TwoParens)
+ [[Plain [Str "Third",Space,Str "example",Str "."]]]
+,Header 2 [Str "Macros"]
+,Para [Math InlineMath "\\langle x,y \\rangle"]
+,Header 2 [Str "Case",Str "-",Str "insensitive",Space,Str "references"]
+,Para [Link [Str "Fum"] ("/fum","")]
+,Para [Link [Str "FUM"] ("/fum","")]
+,Para [Link [Str "bat"] ("/bat","")]
+,Header 2 [Str "Curly",Space,Str "smart",Space,Str "quotes"]
+,Para [Quoted DoubleQuote [Str "Hi"]]
+,Para [Quoted SingleQuote [Str "Hi"]]]