aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2008-07-13 16:31:34 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2008-07-13 16:31:34 +0000
commit7447ecc255af14971c9bb2e035aedb7e386e6aa0 (patch)
tree50df9c24873a62ecbe2b558d9576644bb2286266
parent2e4592b35ba97d283c56afb89a87c1ea81e7510b (diff)
downloadpandoc-7447ecc255af14971c9bb2e035aedb7e386e6aa0.tar.gz
Escape '\160' as "&#160;", not "&nbsp;" in XML.
"nbsp" isn't a predefined XML entity. git-svn-id: https://pandoc.googlecode.com/svn/trunk@1303 788f1e2b-df1e-0410-8736-df70ead52e1b
-rw-r--r--Text/Pandoc/XML.hs12
-rw-r--r--tests/writer.docbook6
2 files changed, 9 insertions, 9 deletions
diff --git a/Text/Pandoc/XML.hs b/Text/Pandoc/XML.hs
index a09a8c150..14e2eebbb 100644
--- a/Text/Pandoc/XML.hs
+++ b/Text/Pandoc/XML.hs
@@ -38,12 +38,12 @@ import Text.PrettyPrint.HughesPJ
-- | Escape one character as needed for XML.
escapeCharForXML :: Char -> String
escapeCharForXML x = case x of
- '&' -> "&amp;"
- '<' -> "&lt;"
- '>' -> "&gt;"
- '"' -> "&quot;"
- '\160' -> "&nbsp;"
- c -> [c]
+ '&' -> "&amp;"
+ '<' -> "&lt;"
+ '>' -> "&gt;"
+ '"' -> "&quot;"
+ '\160' -> "&#160;"
+ c -> [c]
-- | True if the character needs to be escaped.
needsEscaping :: Char -> Bool
diff --git a/tests/writer.docbook b/tests/writer.docbook
index 4860e7d66..e8f963b58 100644
--- a/tests/writer.docbook
+++ b/tests/writer.docbook
@@ -606,7 +606,7 @@ These should not be escaped: \$ \\ \&gt; \[ \{
Should not be a list item:
</para>
<para>
- M.A.&nbsp;2007
+ M.A.&#160;2007
</para>
<para>
B. Williams
@@ -795,12 +795,12 @@ These should not be escaped: \$ \\ \&gt; \[ \{
<para>
Superscripts: a<superscript>bc</superscript>d
a<superscript><emphasis>hello</emphasis></superscript>
- a<superscript>hello&nbsp;there</superscript>.
+ a<superscript>hello&#160;there</superscript>.
</para>
<para>
Subscripts: H<subscript>2</subscript>O,
H<subscript>23</subscript>O,
- H<subscript>many&nbsp;of&nbsp;them</subscript>O.
+ H<subscript>many&#160;of&#160;them</subscript>O.
</para>
<para>
These should not be superscripts or subscripts, because of the