diff options
| -rw-r--r-- | src/Text/Pandoc/Writers/Muse.hs | 11 | ||||
| -rw-r--r-- | test/Tests/Writers/Muse.hs | 8 |
2 files changed, 5 insertions, 14 deletions
diff --git a/src/Text/Pandoc/Writers/Muse.hs b/src/Text/Pandoc/Writers/Muse.hs index 4086bdd9c..314e7a5c1 100644 --- a/src/Text/Pandoc/Writers/Muse.hs +++ b/src/Text/Pandoc/Writers/Muse.hs @@ -156,15 +156,8 @@ blockToMuse (Para inlines) = do contents <- inlineListToMuse inlines return $ contents <> blankline blockToMuse (LineBlock lns) = do - let splitStanza [] = [] - splitStanza xs = case break (== mempty) xs of - (l, []) -> [l] - (l, _:r) -> l : splitStanza r - let joinWithLinefeeds = nowrap . mconcat . intersperse cr - let joinWithBlankLines = mconcat . intersperse blankline - let prettyfyStanza ls = joinWithLinefeeds <$> mapM inlineListToMuse ls - contents <- joinWithBlankLines <$> mapM prettyfyStanza (splitStanza lns) - return $ blankline $$ "<verse>" $$ contents $$ "</verse>" <> blankline + lns' <- mapM inlineListToMuse lns + return $ nowrap $ vcat (map ((text "> ") <>) lns') <> blankline blockToMuse (CodeBlock (_,_,_) str) = return $ "<example>" $$ text str $$ "</example>" $$ blankline blockToMuse (RawBlock (Format format) str) = diff --git a/test/Tests/Writers/Muse.hs b/test/Tests/Writers/Muse.hs index bbf833563..a5a6986f2 100644 --- a/test/Tests/Writers/Muse.hs +++ b/test/Tests/Writers/Muse.hs @@ -34,11 +34,9 @@ tests = [ testGroup "block elements" ] ] , "line block" =: lineBlock [text "Foo", text "bar", text "baz"] - =?> unlines [ "<verse>" - , "Foo" - , "bar" - , "baz" - , "</verse>" + =?> unlines [ "> Foo" + , "> bar" + , "> baz" ] , "code block" =: codeBlock "int main(void) {\n\treturn 0;\n}" =?> unlines [ "<example>" |