diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2018-10-21 23:01:58 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2018-10-21 23:01:58 -0700 |
| commit | 4625150f4caa11c99cb21969480fa044472617c7 (patch) | |
| tree | 18079598d2bdb8ce18a8f0b6d5baa63a1fde3ad7 | |
| parent | 07a083582417c57f40a6780740f0bb2de5f83d16 (diff) | |
| download | pandoc-4625150f4caa11c99cb21969480fa044472617c7.tar.gz | |
Man reader: fix code block tests.
They incorporated a spurious newline which needs to be
removed.
| -rw-r--r-- | src/Text/Pandoc/Readers/Man.hs | 1 | ||||
| -rw-r--r-- | test/man-reader.native | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Text/Pandoc/Readers/Man.hs b/src/Text/Pandoc/Readers/Man.hs index 48f488c92..c449590ff 100644 --- a/src/Text/Pandoc/Readers/Man.hs +++ b/src/Text/Pandoc/Readers/Man.hs @@ -655,6 +655,7 @@ parseCodeBlock = try $ do removeFinalNewline [] = [] removeFinalNewline xs = if last xs == '\n' then init xs else xs + extractText :: ManToken -> Maybe String extractText (MLine ss) = Just $ linePartsToString ss extractText MEmptyLine = Just "" diff --git a/test/man-reader.native b/test/man-reader.native index 9973ac022..c8822d61b 100644 --- a/test/man-reader.native +++ b/test/man-reader.native @@ -14,16 +14,16 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "Oct",Space,Str "17,", ,Header 1 ("",[],[]) [Str "Block",Space,Str "Quotes"] ,Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"] ,BlockQuote - [CodeBlock ("",[],[]) "\nsub status {\n print \"working\";\n}"] + [CodeBlock ("",[],[]) "sub status {\n print \"working\";\n}"] ,Para [Str "A",Space,Str "list:"] ,OrderedList (1,Decimal,Period) [[Para [Str "item",Space,Str "one"]] ,[Para [Str "item",Space,Str "two"]]] ,Header 1 ("",[],[]) [Str "Code",Space,Str "Blocks"] ,Para [Str "Code:"] -,CodeBlock ("",[],[]) "\n---- (should be four hyphens)\n\nsub status {\n print \"working\";\n}\n" +,CodeBlock ("",[],[]) "---- (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" +,CodeBlock ("",[],[]) "\tthis code line is indented by one tab" ,Para [Str "*",Space,Str "*",Space,Str "*",Space,Str "*",Space,Str "*"] ,Header 1 ("",[],[]) [Str "Lists"] ,Header 2 ("",[],[]) [Str "Unordered"] |