Switched to using the xqueryparser.xq parser.

README.md

@@ -186,6 +186,9 @@ Thanks to [Darin McBeath](http://xqdoc.org/history.html) for creating
 the original xqDoc, which xquerydoc borrows heavily. xqDoc is released under the
 Apache License, Version 2.0
 
+The [XQuery parser](https://github.com/jpcs/xqueryparser.xq) itself is now a
+separate library under Apache License, Version 2.
+
 XQuery parsers were generated from EBNF using Gunther Rademacher's
 excellent http://www.bottlecaps.de/rex/
 

src/lib/html-module.xsl

@@ -131,8 +131,8 @@ version="2.0">
   <xsl:template match="doc:variable[@private]"/>
 
   <xsl:template match="doc:variable">
-    <div id="{ concat('var_', replace(doc:uri, ':', '_')) }">
-      <h4><pre class="prettyprint lang-xq"><u>Variable</u>:&#160;$<xsl:value-of select="doc:uri"/> as <xsl:value-of select="doc:type"/><xsl:value-of select="doc:type/@occurrence"/></pre></h4>
+    <div id="{ concat('var_', replace(doc:name, ':', '_')) }">
+      <h4><pre class="prettyprint lang-xq"><u>Variable</u>:&#160;$<xsl:value-of select="doc:name"/> as <xsl:value-of select="doc:type"/><xsl:value-of select="doc:type/@occurrence"/></pre></h4>
       <xsl:apply-templates select="doc:comment"/>
     </div>
   </xsl:template>

src/lib/markdown-module.xsl

@@ -63,10 +63,10 @@ version="2.0">
 
   <xsl:template match="doc:variable">
     <xsl:text>
-### &lt;a name="</xsl:text><xsl:sequence select="concat('var_', replace(doc:uri, ':', '_'))"/><xsl:text>"/&gt; $</xsl:text><xsl:value-of select="doc:uri"/><xsl:text>
+### &lt;a name="</xsl:text><xsl:sequence select="concat('var_', replace(doc:name, ':', '_'))"/><xsl:text>"/&gt; $</xsl:text><xsl:value-of select="doc:name"/><xsl:text>
 </xsl:text>
     <xsl:text>```xquery
-$</xsl:text><xsl:value-of select="doc:uri"/><xsl:text> as </xsl:text><xsl:value-of select="doc:escape(doc:type)"/><xsl:value-of select="doc:escape(doc:type/@occurrence)"/><xsl:text>
+$</xsl:text><xsl:value-of select="doc:name"/><xsl:text> as </xsl:text><xsl:value-of select="doc:escape(doc:type)"/><xsl:value-of select="doc:escape(doc:type/@occurrence)"/><xsl:text>
 ```
 </xsl:text>
     <xsl:apply-templates select="doc:comment"/>
@@ -262,7 +262,7 @@ Version: </xsl:text><xsl:value-of select="doc:escape(.)"/>
 * Variables: </xsl:text>
     <xsl:for-each select="doc:variable[not(@private)]">
       <xsl:if test="position() ne 1"><xsl:text>, </xsl:text></xsl:if>
-      <xsl:text>[$</xsl:text><xsl:value-of select="doc:uri"/><xsl:text>](#</xsl:text><xsl:sequence select="concat('var_', replace(doc:uri, ':', '_'))"/><xsl:text>)</xsl:text>
+      <xsl:text>[$</xsl:text><xsl:value-of select="doc:name"/><xsl:text>](#</xsl:text><xsl:sequence select="concat('var_', replace(doc:name, ':', '_'))"/><xsl:text>)</xsl:text>
     </xsl:for-each>
   </xsl:template>
 

src/xquery/parsers/XQueryML30.xq

@@ -1882,7 +1882,7 @@ declare function p:transition($input as xs:string,
                               $end as xs:integer,
                               $result as xs:integer,
                               $current-state as xs:integer,
-                              $previous-state as xs:integer) as xs:integer+
+                              $previous-state as xs:integer)
 {
   if ($current-state = 0) then
     let $result := $result idiv 2048