git.iko.soy/typeable/pandoc
on master help sign in
Markdown writer: fixes for GHC 7.10.
b983adfJohn MacFarlane
src/Text/Pandoc/Writers/Markdown.hs+3−3
@@ -724,9 +724,9 @@ avoidBadWrapsInList [] = []
724avoidBadWrapsInList (Space:Str ('>':cs):xs) =
724avoidBadWrapsInList (Space:Str ('>':cs):xs) =
725 Str (' ':'>':cs) : avoidBadWrapsInList xs
725 Str (' ':'>':cs) : avoidBadWrapsInList xs
726avoidBadWrapsInList (Space:Str [c]:[])
726avoidBadWrapsInList (Space:Str [c]:[])
727− | c `elem` "-*+" = Str [' ', c] : []
727+ | c `elem` ['-','*','+'] = Str [' ', c] : []
728avoidBadWrapsInList (Space:Str [c]:Space:xs)
728avoidBadWrapsInList (Space:Str [c]:Space:xs)
729− | c `elem` "-*+" = Str [' ', c] : Space : avoidBadWrapsInList xs
729+ | c `elem` ['-','*','+'] = Str [' ', c] : Space : avoidBadWrapsInList xs
730avoidBadWrapsInList (Space:Str cs:Space:xs)
730avoidBadWrapsInList (Space:Str cs:Space:xs)
731 | isOrderedListMarker cs = Str (' ':cs) : Space : avoidBadWrapsInList xs
731 | isOrderedListMarker cs = Str (' ':cs) : Space : avoidBadWrapsInList xs
732avoidBadWrapsInList (Space:Str cs:[])
732avoidBadWrapsInList (Space:Str cs:[])
@@ -734,7 +734,7 @@ avoidBadWrapsInList (Space:Str cs:[])
734avoidBadWrapsInList (x:xs) = x : avoidBadWrapsInList xs
734avoidBadWrapsInList (x:xs) = x : avoidBadWrapsInList xs
735
735
736isOrderedListMarker :: String -> Bool
736isOrderedListMarker :: String -> Bool
737−isOrderedListMarker xs = (last xs `elem` ".)") &&
737+isOrderedListMarker xs = (last xs `elem` ['.',')']) &&
738 isRight (runParserT (anyOrderedListMarker >> eof)
738 isRight (runParserT (anyOrderedListMarker >> eof)
739 defaultParserState "" xs)
739 defaultParserState "" xs)
740
740