Unescape < in comments, and don't remove newlines from them

xquery · Jun 28, 2012 · 8db4ad7 · 8db4ad7
1 parent 3442410
commit 8db4ad7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/lib/markdown-module.xsl b/src/lib/markdown-module.xsl
@@ -13,7 +13,7 @@ version="2.0">
 
   <xsl:function name="doc:escape" as="xs:string">
     <xsl:param name="string"/>
-    <xsl:sequence select="replace($string,'\*','\\*')"/>
+    <xsl:sequence select="replace(replace($string,'\*','\\*'),'&amp;lt;','&lt;')"/>
   </xsl:function>
 
   <!-- generate module html //-->
@@ -191,7 +191,7 @@ $</xsl:text><xsl:value-of select="doc:name"/><xsl:text> as </xsl:text><xsl:value
     <xsl:text>
 
 ```xquery
-</xsl:text><xsl:value-of select="."/><xsl:text>
+</xsl:text><xsl:value-of select="doc:escape(.)"/><xsl:text>
 ```
 </xsl:text>
   </xsl:template>

diff --git a/src/xquery/xquerydoc.xq b/src/xquery/xquerydoc.xq
@@ -71,7 +71,7 @@ declare (: private :) function _commentContents($e)
 {
   typeswitch($e)
   case element(Char) return $e/node()
-  case element(Trim) return text { " " }
+  case element(Trim) return text { "&#xa;" }
   case element(ElementContentChar) return $e/node()
   case element(QuotAttrContentChar) return $e/node()
   case element(AposAttrContentChar) return $e/node()