git.iko.soy/typeable/pandoc
on master help sign in
HTML writer: Use functions from XML module to escape strings.
41aff1cfiddlosopher
src/Text/Pandoc/Writers/HTML.hs+2−8
compare with master
unifiedsplit
@@ -35,7 +35,7 @@ import Text.Pandoc.Shared
35import Text.Pandoc.Templates
35import Text.Pandoc.Templates
36import Text.Pandoc.Readers.TeXMath
36import Text.Pandoc.Readers.TeXMath
37import Text.Pandoc.Highlighting ( highlightHtml )
37import Text.Pandoc.Highlighting ( highlightHtml )
38−import Text.Pandoc.XML (stripTags)
38+import Text.Pandoc.XML (stripTags, escapeStringForXML)
39import Numeric ( showHex )
39import Numeric ( showHex )
40import Data.Char ( ord, toLower )
40import Data.Char ( ord, toLower )
41import Data.List ( isPrefixOf, intersperse )
41import Data.List ( isPrefixOf, intersperse )
@@ -63,13 +63,7 @@ renderFragment opts = if writerWrapText opts
63-- | Modified version of Text.XHtml's stringToHtml.
63-- | Modified version of Text.XHtml's stringToHtml.
64-- Use unicode characters wherever possible.
64-- Use unicode characters wherever possible.
65stringToHtml :: String -> Html
65stringToHtml :: String -> Html
66−stringToHtml = primHtml . concatMap fixChar
66+stringToHtml = primHtml . escapeStringForXML
67− where
68− fixChar '<' = "&lt;"
69− fixChar '>' = "&gt;"
70− fixChar '&' = "&amp;"
71− fixChar '"' = "&quot;"
72− fixChar c = [c]
73
67
74-- | Convert Pandoc document to Html string.
68-- | Convert Pandoc document to Html string.
75writeHtmlString :: WriterOptions -> Pandoc -> String
69writeHtmlString :: WriterOptions -> Pandoc -> String