8b1630a · typeable/pandoc

git.iko.soy/typeable/pandoc

Muse writer: change verse markup

Use "> " instead of <verse> tag

commit8b1630aae029a0c4ce6e6dc881d3e11d0ca7e9ce authorAlexander Krotov <ilabdsf@gmail.com> dateWed 28 Feb 2018, 14:42 (9 years ago) parent1d57f7a

2 files changed+5−14

unifiedsplit

src/Text/Pandoc/Writers/Muse.hs+2−9

@@ -156,15 +156,8 @@ blockToMuse (Para inlines) = do

156156 contents <- inlineListToMuse inlines

157157 return $ contents <> blankline

158158blockToMuse (LineBlock lns) = do

159− let splitStanza [] = []

160− splitStanza xs = case break (== mempty) xs of

161− (l, []) -> [l]

162− (l, _:r) -> l : splitStanza r

163− let joinWithLinefeeds = nowrap . mconcat . intersperse cr

164− let joinWithBlankLines = mconcat . intersperse blankline

165− let prettyfyStanza ls = joinWithLinefeeds <$> mapM inlineListToMuse ls

166− contents <- joinWithBlankLines <$> mapM prettyfyStanza (splitStanza lns)

167− return $ blankline $$ "<verse>" $$ contents $$ "</verse>" <> blankline

159+ lns' <- mapM inlineListToMuse lns

160+ return $ nowrap $ vcat (map ((text "> ") <>) lns') <> blankline

168161blockToMuse (CodeBlock (_,_,_) str) =

169162 return $ "<example>" $$ text str $$ "</example>" $$ blankline

170163blockToMuse (RawBlock (Format format) str) =

test/Tests/Writers/Muse.hs+3−5

@@ -34,11 +34,9 @@ tests = [ testGroup "block elements"

3434 ]

3535 ]

3636 , "line block" =: lineBlock [text "Foo", text "bar", text "baz"]

37− =?> unlines [ "<verse>"

38− , "Foo"

39− , "bar"

40− , "baz"

41− , "</verse>"

37+ =?> unlines [ "> Foo"

38+ , "> bar"

39+ , "> baz"

4240 ]

4341 , "code block" =: codeBlock "int main(void) {\n\treturn 0;\n}"

4442 =?> unlines [ "<example>"