Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into docbookreader

Browse source
This commit is contained in:
John MacFarlane 2012-04-14 22:53:08 -07:00
commit a0424d2f82
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Text/Pandoc/XML.hs
View file

@ -38,7 +38,7 @@ module Text.Pandoc.XML ( stripTags,
fromEntities ) where fromEntities ) where
import Text.Pandoc.Pretty import Text.Pandoc.Pretty
import Data.Char (ord, isAscii) import Data.Char (ord, isAscii, isSpace)
import Text.HTML.TagSoup.Entity (lookupEntity) import Text.HTML.TagSoup.Entity (lookupEntity)
-- | Remove everything between <...> -- | Remove everything between <...>
@ -106,8 +106,8 @@ fromEntities :: String -> String
fromEntities ('&':xs) = fromEntities ('&':xs) =
case lookupEntity ent of case lookupEntity ent of
Just c -> c : fromEntities rest Just c -> c : fromEntities rest
Nothing -> '&' : fromEntities rest Nothing -> '&' : fromEntities xs
where (ent, rest) = case break (==';') xs of where (ent, rest) = case break (\c -> isSpace c || c == ';') xs of
(zs,';':ys) -> (zs,ys) (zs,';':ys) -> (zs,ys)
_ -> ("",xs) _ -> ("",xs)
fromEntities (x:xs) = x : fromEntities xs fromEntities (x:xs) = x : fromEntities xs