Made changes to correct handling of nested answer/qandaentry

instances. Closes bug 1509043. Thanks to Daniel Leidert.

To avoid code duplication, part of the change involved adding a
new process.qandaset named template and moving the code for output
of all the question/answer table markup into that template.

diff --git a/xsl/html/qandaset.xsl b/xsl/html/qandaset.xsl
index 1930fdba28f369a141b602f1b82ea04bf2598fe1..1f8ab65fe951d024926f260e9602805b669f8845 100644 (file)
--- a/xsl/html/qandaset.xsl
+++ b/xsl/html/qandaset.xsl
@@ -22,38 +22,6 @@
                                           and name(.) != 'titleabbrev'
                                           and name(.) != 'qandadiv'
                                           and name(.) != 'qandaentry']"/>
-  <xsl:variable name="label-width">
-    <xsl:call-template name="dbhtml-attribute">
-      <xsl:with-param name="pis"
-                      select="processing-instruction('dbhtml')"/>
-      <xsl:with-param name="attribute" select="'label-width'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="table-summary">
-    <xsl:call-template name="dbhtml-attribute">
-      <xsl:with-param name="pis"
-                      select="processing-instruction('dbhtml')"/>
-      <xsl:with-param name="attribute" select="'table-summary'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="cellpadding">
-    <xsl:call-template name="dbhtml-attribute">
-      <xsl:with-param name="pis"
-                      select="processing-instruction('dbhtml')"/>
-      <xsl:with-param name="attribute" select="'cellpadding'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="cellspacing">
-    <xsl:call-template name="dbhtml-attribute">
-      <xsl:with-param name="pis"
-                      select="processing-instruction('dbhtml')"/>
-      <xsl:with-param name="attribute" select="'cellspacing'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
   <xsl:variable name="toc">
     <xsl:call-template name="dbhtml-attribute">
       <xsl:with-param name="pis"
@@ -74,39 +42,7 @@
       <xsl:call-template name="process.qanda.toc"/>
     </xsl:if>
     <xsl:apply-templates select="$preamble"/>
-    <table border="0" summary="Q and A Set">
-      <xsl:if test="$table-summary != ''">
-        <xsl:attribute name="summary">
-          <xsl:value-of select="$table-summary"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:if test="$cellpadding != ''">
-        <xsl:attribute name="cellpadding">
-          <xsl:value-of select="$cellpadding"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:if test="$cellspacing != ''">
-        <xsl:attribute name="cellspacing">
-          <xsl:value-of select="$cellspacing"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <col align="left">
-        <xsl:attribute name="width">
-          <xsl:choose>
-            <xsl:when test="$label-width != ''">
-              <xsl:value-of select="$label-width"/>
-            </xsl:when>
-            <xsl:otherwise>1%</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </col>
-      <tbody>
-        <xsl:apply-templates select="qandaentry|qandadiv"/>
-      </tbody>
-    </table>
+    <xsl:call-template name="process.qandaset"/>
   </div>
 </xsl:template>
 
@@ -273,7 +209,13 @@
       </xsl:if>
     </td>
     <td align="left" valign="top">
-      <xsl:apply-templates select="*[name(.) != 'label']"/>
+      <xsl:apply-templates select="*[name(.) != 'label'
+        and name(.) != 'qandaentry']"/>
+      <!-- * handle nested answer/qandaentry instances -->
+      <!-- * (bug 1509043 from Daniel Leidert) -->
+      <xsl:if test="child::qandaentry">
+        <xsl:call-template name="process.qandaset"/>
+      </xsl:if>
     </td>
   </tr>
 </xsl:template>
@@ -358,6 +300,77 @@
 
 <!-- ==================================================================== -->
 
+<xsl:template name="process.qandaset">
+
+  <xsl:variable name="label-width">
+    <xsl:call-template name="dbhtml-attribute">
+      <xsl:with-param name="pis"
+        select="processing-instruction('dbhtml')"/>
+      <xsl:with-param name="attribute" select="'label-width'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="table-summary">
+    <xsl:call-template name="dbhtml-attribute">
+      <xsl:with-param name="pis"
+        select="processing-instruction('dbhtml')"/>
+      <xsl:with-param name="attribute" select="'table-summary'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="cellpadding">
+    <xsl:call-template name="dbhtml-attribute">
+      <xsl:with-param name="pis"
+        select="processing-instruction('dbhtml')"/>
+      <xsl:with-param name="attribute" select="'cellpadding'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="cellspacing">
+    <xsl:call-template name="dbhtml-attribute">
+      <xsl:with-param name="pis"
+        select="processing-instruction('dbhtml')"/>
+      <xsl:with-param name="attribute" select="'cellspacing'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <table border="0" summary="Q and A Set">
+    <xsl:if test="$table-summary != ''">
+      <xsl:attribute name="summary">
+        <xsl:value-of select="$table-summary"/>
+      </xsl:attribute>
+    </xsl:if>
+
+    <xsl:if test="$cellpadding != ''">
+      <xsl:attribute name="cellpadding">
+        <xsl:value-of select="$cellpadding"/>
+      </xsl:attribute>
+    </xsl:if>
+
+    <xsl:if test="$cellspacing != ''">
+      <xsl:attribute name="cellspacing">
+        <xsl:value-of select="$cellspacing"/>
+      </xsl:attribute>
+    </xsl:if>
+
+    <col align="left">
+      <xsl:attribute name="width">
+        <xsl:choose>
+          <xsl:when test="$label-width != ''">
+            <xsl:value-of select="$label-width"/>
+          </xsl:when>
+          <xsl:otherwise>1%</xsl:otherwise>
+        </xsl:choose>
+      </xsl:attribute>
+    </col>
+    <tbody>
+      <xsl:apply-templates select="qandaentry|qandadiv"/>
+    </tbody>
+  </table>
+</xsl:template>
+
+<!-- ==================================================================== -->
+
 <xsl:template match="*" mode="no.wrapper.mode">
   <xsl:apply-templates/>
 </xsl:template>