HTML writer: Use functions from XML module to escape strings.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1768 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
fiddlosopher
2010-01-01 04:11:54 +00:00
parent 87c66d4623
commit 41aff1cf55
+2 -8
View File
@@ -35,7 +35,7 @@ import Text.Pandoc.Shared
import Text.Pandoc.Templates
import Text.Pandoc.Readers.TeXMath
import Text.Pandoc.Highlighting ( highlightHtml )
import Text.Pandoc.XML (stripTags)
import Text.Pandoc.XML (stripTags, escapeStringForXML)
import Numeric ( showHex )
import Data.Char ( ord, toLower )
import Data.List ( isPrefixOf, intersperse )
@@ -63,13 +63,7 @@ renderFragment opts = if writerWrapText opts
-- | Modified version of Text.XHtml's stringToHtml.
-- Use unicode characters wherever possible.
stringToHtml :: String -> Html
stringToHtml = primHtml . concatMap fixChar
where
fixChar '<' = "&lt;"
fixChar '>' = "&gt;"
fixChar '&' = "&amp;"
fixChar '"' = "&quot;"
fixChar c = [c]
stringToHtml = primHtml . escapeStringForXML
-- | Convert Pandoc document to Html string.
writeHtmlString :: WriterOptions -> Pandoc -> String