diff options
-rw-r--r-- | test/Tests/Readers/Man.hs | 4 | ||||
-rw-r--r-- | test/man-reader.man | 10 | ||||
-rw-r--r-- | test/man-reader.native | 48 |
3 files changed, 30 insertions, 32 deletions
diff --git a/test/Tests/Readers/Man.hs b/test/Tests/Readers/Man.hs index 9dbfbab4d..22e0cbaf7 100644 --- a/test/Tests/Readers/Man.hs +++ b/test/Tests/Readers/Man.hs @@ -56,7 +56,7 @@ tests = [ =?> (para $ str "ab") , "replace" =: "\\-\\ \\\\\\[lq]\\[rq]\\[em]\\[en]\\*(lq\\*(rq" - =?> (para $ str "- \\“”—–«»") + =?> (para $ str "- \\“”—–“”") , "replace2" =: "\\t\\e\\`\\^\\|\\'" =?> (para $ str "\t\\` `") @@ -65,7 +65,7 @@ tests = [ "bullet" =: ".IP\nfirst\n.IP\nsecond" =?> bulletList [plain $ str "first", plain $ str "second"] - , "odrered" =: + , "ordered" =: ".IP 1 a\nfirst\n.IP 2 a\nsecond" =?> orderedListWith (1,Decimal,DefaultDelim) [plain $ str "first", plain $ str "second"] , "upper" =: diff --git a/test/man-reader.man b/test/man-reader.man index 4f3395051..e514bc8ca 100644 --- a/test/man-reader.man +++ b/test/man-reader.man @@ -49,10 +49,10 @@ Code: .IP .nf \f[C] -\-\-\-\-\ (should\ be\ four\ hyphens) +\-\-\-\- (should be four hyphens) -sub\ status\ { -\ \ \ \ print\ "working"; +sub status { + print "working"; } \f[] @@ -62,9 +62,7 @@ And: .IP .nf \f[C] -\tthis\ code\ line is\ indented\ by\ one\ tab - -These\ should\ not\ be\ escaped:\ \ \\$\ \\\\\ \\>\ \\[\ \\{ +\tthis code line is indented by one tab \f[] .fi .PP diff --git a/test/man-reader.native b/test/man-reader.native index 1fa010bd6..7697870ca 100644 --- a/test/man-reader.native +++ b/test/man-reader.native @@ -14,62 +14,62 @@ Pandoc (Meta {unMeta = fromList [("title",MetaString "Pandoc Man tests")]}) ,Para [Str " * * * * *"] ,Header 2 ("",[],[]) [Str "Block",Space,Str "Quotes"] ,Para [Str "Code in a block quote:"] -,CodeBlock ("",[],[]) "\nsub status {\n print \"working\";\n}\n" +,CodeBlock ("",[],[]) "\nsub status {\n print \"working\";\n}" ,Para [Str "A list:"] -,OrderedList (1,Decimal,DefaultDelim) +,OrderedList (1,Decimal,Period) [[Plain [Str "item one"]] ,[Plain [Str "item two"]]] ,Header 2 ("",[],[]) [Str "Code",Space,Str "Blocks"] ,Para [Str "Code:"] -,CodeBlock ("",[],[]) "\n---- (should be four hyphens)\n\nsub status {\n print \"working\";\n}\n\n" +,CodeBlock ("",[],[]) "\n---- (should be four hyphens)\n\nsub status {\n print \"working\";\n}\n" ,Para [Str "And:"] -,CodeBlock ("",[],[]) "\n\tthis code line is indented by one tab\n\nThese should not be escaped: \\$ \\\\ \\> \\[ \\{\n" +,CodeBlock ("",[],[]) "\n\tthis code line is indented by one tab" ,Para [Str " * * * * *"] ,Header 2 ("",[],[]) [Str "Lists"] ,Header 3 ("",[],[]) [Str "Unordered"] ,Para [Str "Asterisks:"] ,BulletList - [[Plain [Str "",Space,Str "asterisk 1"]] - ,[Plain [Str "",Space,Str "asterisk 2"]] - ,[Plain [Str "",Space,Str "asterisk 3"]]] + [[Plain [Str "asterisk 1"]] + ,[Plain [Str "asterisk 2"]] + ,[Plain [Str "asterisk 3"]]] ,Header 3 ("",[],[]) [Str "Ordered"] -,OrderedList (1,Decimal,DefaultDelim) +,OrderedList (1,Decimal,Period) [[Plain [Str "First"]] ,[Plain [Str "Second"]] ,[Plain [Str "Third"]]] ,Header 3 ("",[],[]) [Str "Nested"] ,BulletList - [[Plain [Str "",Space,Str "Tab"] + [[Plain [Str "Tab"] ,BulletList - [[Plain [Str "",Space,Str "Tab"] + [[Plain [Str "Tab"] ,BulletList - [[Plain [Str "",Space,Str "Tab"]]]]]]] + [[Plain [Str "Tab"]]]]]]] ,Para [Str "Here's another:"] -,OrderedList (1,Decimal,DefaultDelim) +,OrderedList (1,Decimal,Period) [[Plain [Str "First"]] ,[Plain [Str "Second:"] ,BulletList - [[Plain [Str "",Space,Str "Fee"]] - ,[Plain [Str "",Space,Str "Fie"]] - ,[Plain [Str "",Space,Str "Foe"]]]] + [[Plain [Str "Fee"]] + ,[Plain [Str "Fie"]] + ,[Plain [Str "Foe"]]]] ,[Plain [Str "Third"]]] ,Para [Str "Same thing:"] -,OrderedList (1,Decimal,DefaultDelim) +,OrderedList (1,Decimal,Period) [[Plain [Str "First"]] ,[Plain [Str "Second:"] ,BulletList - [[Plain [Str "",Space,Str "Fee"]] - ,[Plain [Str "",Space,Str "Fie"]] - ,[Plain [Str "",Space,Str "Foe"]]]] + [[Plain [Str "Fee"]] + ,[Plain [Str "Fie"]] + ,[Plain [Str "Foe"]]]] ,[Plain [Str "Third"]]] ,Header 3 ("",[],[]) [Str "different",Space,Str "styles:"] -,OrderedList (1,UpperAlpha,DefaultDelim) +,OrderedList (1,UpperAlpha,Period) [[Plain [Str "Upper Alpha"] - ,OrderedList (1,UpperAlpha,DefaultDelim) + ,OrderedList (1,UpperRoman,Period) [[Plain [Str "Upper Roman."] - ,BulletList - [[Plain [Str "(6)",Space,Str "Decimal start with 6"] - ,OrderedList (1,LowerAlpha,DefaultDelim) + ,OrderedList (6,Decimal,TwoParens) + [[Plain [Str "Decimal start with 6"] + ,OrderedList (3,LowerAlpha,OneParen) [[Plain [Str "Lower alpha with paren"]]]]]]]]] ,Para [Str " * * * * *"] ,Header 2 ("",[],[]) [Str "Special",Space,Str "Characters"] |