git.iko.soy/typeable/pandoc
on master help sign in
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

commit41aff1cf5572bb3840aaeaecf1e21fe36e181730 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateFri 1 Jan 2010, 04:11 (17 years ago) parent87c66d4
1 file changed+2−8
compare with master
unifiedsplit
src/Text/Pandoc/Writers/HTML.hs+2−8
src/Text/Pandoc/Writers/HTML.hs+2−8
@@ -35,7 +35,7 @@ import Text.Pandoc.Shared
3535import Text.Pandoc.Templates
3636import Text.Pandoc.Readers.TeXMath
3737import Text.Pandoc.Highlighting ( highlightHtml )
38−import Text.Pandoc.XML (stripTags)
38+import Text.Pandoc.XML (stripTags, escapeStringForXML)
3939import Numeric ( showHex )
4040import Data.Char ( ord, toLower )
4141import Data.List ( isPrefixOf, intersperse )
@@ -63,13 +63,7 @@ renderFragment opts = if writerWrapText opts
6363-- | Modified version of Text.XHtml's stringToHtml.
6464-- Use unicode characters wherever possible.
6565stringToHtml :: String -> Html
66−stringToHtml = primHtml . concatMap fixChar
67− where
68− fixChar '<' = "&lt;"
69− fixChar '>' = "&gt;"
70− fixChar '&' = "&amp;"
71− fixChar '"' = "&quot;"
72− fixChar c = [c]
66+stringToHtml = primHtml . escapeStringForXML
7367
7468-- | Convert Pandoc document to Html string.
7569writeHtmlString :: WriterOptions -> Pandoc -> String