From 000b89c718fdef3790a56fad9cbbfcdcf7fbea52 Mon Sep 17 00:00:00 2001 From: fiddlosopher Date: Mon, 8 Sep 2008 06:36:28 +0000 Subject: Use Data.List's 'intercalate' instead of custom 'joinWithSep'. + Removed joinWithSep definition from Text.Pandoc.Shared. + Replaced joinWithSep with intercalate + Depend on base >= 3, since in base < 3 intercalate is not included. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1428 788f1e2b-df1e-0410-8736-df70ead52e1b --- Text/Pandoc/Readers/HTML.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Text/Pandoc/Readers/HTML.hs') diff --git a/Text/Pandoc/Readers/HTML.hs b/Text/Pandoc/Readers/HTML.hs index 72e54ed23..a9025f0d2 100644 --- a/Text/Pandoc/Readers/HTML.hs +++ b/Text/Pandoc/Readers/HTML.hs @@ -46,7 +46,7 @@ import Text.Pandoc.Definition import Text.Pandoc.Shared import Text.Pandoc.CharacterReferences ( decodeCharacterReferences ) import Data.Maybe ( fromMaybe ) -import Data.List ( takeWhile, dropWhile, isPrefixOf, isSuffixOf ) +import Data.List ( takeWhile, dropWhile, isPrefixOf, isSuffixOf, intercalate ) import Data.Char ( toLower, isAlphaNum ) import Network.URI ( parseURIReference, URI (..) ) @@ -534,7 +534,7 @@ definitionListItem :: GenParser Char ParserState ([Inline], [Block]) definitionListItem = try $ do terms <- sepEndBy1 (inlinesIn "dt") spaces defs <- sepEndBy1 (blocksIn "dd") spaces - let term = joinWithSep [LineBreak] terms + let term = intercalate [LineBreak] terms return (term, concat defs) -- @@ -580,7 +580,7 @@ code = try $ do -- remove internal line breaks, leading and trailing space, -- and decode character references return $ Code $ decodeCharacterReferences $ removeLeadingTrailingSpace $ - joinWithSep " " $ lines result + intercalate " " $ lines result rawHtmlInline :: GenParser Char ParserState Inline rawHtmlInline = do -- cgit v1.2.3