From 8b1630aae029a0c4ce6e6dc881d3e11d0ca7e9ce Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Wed, 28 Feb 2018 14:42:43 +0300 Subject: Muse writer: change verse markup Use "> " instead of tag --- src/Text/Pandoc/Writers/Muse.hs | 11 ++--------- 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 $$ "" $$ contents $$ "" <> blankline + lns' <- mapM inlineListToMuse lns + return $ nowrap $ vcat (map ((text "> ") <>) lns') <> blankline blockToMuse (CodeBlock (_,_,_) str) = return $ "" $$ text str $$ "" $$ 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 [ "" - , "Foo" - , "bar" - , "baz" - , "" + =?> unlines [ "> Foo" + , "> bar" + , "> baz" ] , "code block" =: codeBlock "int main(void) {\n\treturn 0;\n}" =?> unlines [ "" -- cgit v1.2.3