Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Muse reader: trim newlines from <example>s

Browse source
This commit is contained in:
Alexander Krotov 2017-09-10 12:42:24 +03:00
parent cbdeed9cfd
commit afedb41b17
2 changed files with 35 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Text/Pandoc/Readers/Muse.hs
View file

@ -223,7 +223,16 @@ header = try $ do
return $ B.headerWith attr level <$> content
exampleTag :: PandocMonad m => MuseParser m (F Blocks)
exampleTag = liftM (return . uncurry B.codeBlockWith) $ htmlElement "example"
exampleTag = do
(attr, contents) <- htmlElement "example"
return $ return $ B.codeBlockWith attr $ chop contents
where lchop s = case s of
'\n':ss -> ss
_ -> s
rchop = reverse . lchop . reverse
-- Trim up to one newline from the beginning and the end,
-- in case opening and/or closing tags are on separate lines.
chop = lchop . rchop
literal :: PandocMonad m => MuseParser m (F Blocks)
literal = liftM (return . rawBlock) $ htmlElement "literal"

25
test/Tests/Readers/Muse.hs
View file

@ -230,6 +230,31 @@ tests =
lineBlock [ "Foo bar" ] <>
lineBlock [ "Foo bar" ] <>
lineBlock [ "\160\160\160Foo" ]
, testGroup "Example tag"
[ "Tags on separate lines" =:
T.unlines [ "<example>"
, "Example line"
, "</example>"
] =?>
codeBlock "Example line"
, "One line" =:
"<example>Example line</example>" =?>
codeBlock "Example line"
, "One blank line in the beginning" =:
T.unlines [ "<example>"
, ""
, "Example line"
, "</example>"
] =?>
codeBlock "\nExample line"
, "One blank line in the end" =:
T.unlines [ "<example>"
, "Example line"
, ""
, "</example>"
] =?>
codeBlock "Example line\n"
]
, "Center" =: "<center>Hello, world</center>" =?> para (text "Hello, world")
, "Right" =: "<right>Hello, world</right>" =?> para (text "Hello, world")
, testGroup "Comments"