merged things from devel

2014-09-12 01:37:48 +02:00 · 2014-09-12 01:37:48 +02:00 · 9d9c3fe121
commit 9d9c3fe121
parent 9500780037 6a29fbf240
14 changed files with 110 additions and 48 deletions
--- a/lib/pure/xmltree.nim
+++ b/lib/pure/xmltree.nim
@ -154,6 +154,8 @@ proc addEscaped*(result: var string, s: string) =
    of '>': result.add("&gt;")
    of '&': result.add("&amp;")
    of '"': result.add("&quot;")
+    of '\'': result.add("&#x27;")
+    of '/': result.add("&#x2F;")
    else: result.add(c)

 proc escape*(s: string): string = 
@ -167,6 +169,8 @@ proc escape*(s: string): string =
  ##  ``>``          ``&gt;``
  ##  ``&``          ``&amp;``
  ##  ``"``          ``&quot;``
+  ##  ``'``          ``&#x27;``
+  ##  ``/``          ``&#x2F;``
  ## ------------    -------------------
  result = newStringOfCap(s.len)
  addEscaped(result, s)