4625150 · typeable/pandoc

git.iko.soy/typeable/pandoc

Man reader: fix code block tests.

They incorporated a spurious newline which needs to be removed.

commit4625150f4caa11c99cb21969480fa044472617c7 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 21 Oct 2018, 23:01 (8 years ago) parent07a0835

2 files changed+4−3

unifiedsplit

src/Text/Pandoc/Readers/Man.hs+1

@@ -655,6 +655,7 @@ parseCodeBlock = try $ do

655655

656656 removeFinalNewline [] = []

657657 removeFinalNewline xs = if last xs == '\n' then init xs else xs

658+

658659 extractText :: ManToken -> Maybe String

659660 extractText (MLine ss) = Just $ linePartsToString ss

660661 extractText MEmptyLine = Just ""

test/man-reader.native+3−3

@@ -14,16 +14,16 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "Oct",Space,Str "17,",

1414,Header 1 ("",[],[]) [Str "Block",Space,Str "Quotes"]

1515,Para [Str "Code",Space,Str "in",Space,Str "a",Space,Str "block",Space,Str "quote:"]

1616,BlockQuote

17− [CodeBlock ("",[],[]) "\nsub status {\n print \"working\";\n}"]

17+ [CodeBlock ("",[],[]) "sub status {\n print \"working\";\n}"]

1818,Para [Str "A",Space,Str "list:"]

1919,OrderedList (1,Decimal,Period)

2020 [[Para [Str "item",Space,Str "one"]]

2121 ,[Para [Str "item",Space,Str "two"]]]

2222,Header 1 ("",[],[]) [Str "Code",Space,Str "Blocks"]

2323,Para [Str "Code:"]

24−,CodeBlock ("",[],[]) "\n---- (should be four hyphens)\n\nsub status {\n print \"working\";\n}\n"

24+,CodeBlock ("",[],[]) "---- (should be four hyphens)\n\nsub status {\n print \"working\";\n}\n"

2525,Para [Str "And:"]

26−,CodeBlock ("",[],[]) "\n\tthis code line is indented by one tab"

26+,CodeBlock ("",[],[]) "\tthis code line is indented by one tab"

2727,Para [Str "*",Space,Str "*",Space,Str "*",Space,Str "*",Space,Str "*"]

2828,Header 1 ("",[],[]) [Str "Lists"]

2929,Header 2 ("",[],[]) [Str "Unordered"]