Merge pull request #104 from ndw/master

Fix bugs in $rootid

gradle.properties

@@ -1,6 +1,6 @@
-version=2.2.1
+version=2.2.2
 saxonVersion=9.8.0-8
-xmlCalabashVersion=1.1.18-98
+xmlCalabashVersion=1.1.19-98
 
 snapshot=
 builtBy=Norman Walsh

xslt/base/common/control.xsl

@@ -17,7 +17,7 @@
   <xsl:param name="document"/>
   <xsl:param name="rootid"/>
 
-  <xsl:if test="$rootid != '' and not(key('id', $rootid, $document))">
+  <xsl:if test="exists($rootid) and ($rootid != '') and not(key('id', $rootid, $document))">
     <xsl:message terminate="yes">
       <xsl:text>ID '</xsl:text>
       <xsl:value-of select="$rootid"/>
@@ -27,7 +27,7 @@
 
   <xsl:variable name="root" as="element()">
     <xsl:choose>
-      <xsl:when test="$rootid != ''">
+      <xsl:when test="exists($rootid) and ($rootid != '')">
 	<xsl:sequence select="key('id', $rootid, $document)"/>
       </xsl:when>
       <xsl:otherwise>
@@ -82,7 +82,7 @@ element (or the element selected for processing with
   <xsl:message terminate="yes">
     <xsl:text>Error: document root element (</xsl:text>
     <xsl:value-of select="name($root/*[1])"/>
-    <xsl:if test="$rootid">
+    <xsl:if test="exists($rootid) and ($rootid != '')">
       <xsl:text>, $rootid=</xsl:text>
       <xsl:value-of select="$rootid"/>
     </xsl:if>

xslt/base/html/chunkfunc.xsl

@@ -31,7 +31,7 @@
       <xsl:when test="string($pibn) != ''">
 	<xsl:value-of select="concat($pibn, $html.ext)"/>
       </xsl:when>
-      <xsl:when test="$chunk/@xml:id and $use.id.as.filename != '0'">
+      <xsl:when test="$chunk/@xml:id and $use.id.as.filename">
 	<xsl:value-of select="concat($chunk/@xml:id,$html.ext)"/>
       </xsl:when>
       <xsl:otherwise>

xslt/base/html/chunktemp.xsl

@@ -108,7 +108,7 @@
 
   <xsl:template match="/">
     <xsl:choose>
-      <xsl:when test="$rootid = ''">
+      <xsl:when test="empty($rootid) or ($rootid = '')">
         <xsl:apply-templates select="$chunks" mode="m:chunk"/>
       </xsl:when>
       <xsl:when test="$chunks[@xml:id = $rootid]">