Use entities for all characters above 127 in docbook output.

Though XML tools should support unicode, some people will be
using SGML tools, and these do not.  Using entities makes the
docbook files more portable.

Also refactored encodeEntities and charToHtmlEntity in
HtmlEntities.hs


git-svn-id: https://pandoc.googlecode.com/svn/trunk@394 788f1e2b-df1e-0410-8736-df70ead52e1b

1 files changed, 7 insertions, 5 deletions

diff --git a/src/Text/Pandoc/Writers/Docbook.hs b/src/Text/Pandoc/Writers/Docbook.hs
index 3916aa214..61f24807b 100644
--- a/src/Text/Pandoc/Writers/Docbook.hs
+++ b/src/Text/Pandoc/Writers/Docbook.hs
@@ -33,9 +33,10 @@ module Text.Pandoc.Writers.Docbook (
 import Text.Pandoc.Definition
 import Text.Pandoc.Shared
 import Text.Pandoc.Writers.HTML ( stringToSmartHtml, stringToHtml )
+import Text.Pandoc.HtmlEntities ( encodeEntities )
 import Text.Html ( stringToHtmlString )
 import Text.Regex ( mkRegex, matchRegex )
-import Data.Char ( toLower )
+import Data.Char ( toLower, ord )
 import Data.List ( isPrefixOf, partition )
 import Text.PrettyPrint.HughesPJ hiding ( Str )
 
@@ -179,9 +180,10 @@ wrap options lst = fsep $ map (hcat . (map (inlineToDocbook options))) (splitByS
 
 -- | Escape a string for XML (with "smart" option if specified).
 stringToXML :: WriterOptions -> String -> String
-stringToXML options = if writerSmart options
-                        then stringToSmartHtml
-                        else stringToHtml
+stringToXML options = encodeEntities .
+                      (if writerSmart options
+                         then stringToSmartHtml
+                         else stringToHtml)
 
 -- | Escape string to XML appropriate for attributes
 attributeStringToXML :: String -> String
@@ -189,7 +191,7 @@ attributeStringToXML = gsub "\"" """ . codeStringToXML
 
 -- | Escape a literal string for XML.
 codeStringToXML :: String -> String
-codeStringToXML = gsub "<" "&lt;" . gsub "&" "&amp;" 
+codeStringToXML = encodeEntities . gsub "<" "&lt;" . gsub "&" "&amp;" 
 
 -- | Convert a list of inline elements to Docbook.
 inlinesToDocbook :: WriterOptions -> [Inline] -> Doc