Fixed bug #695030 where revhistory in qandaentry messed up list-block.

diff --git a/xsl/fo/qandaset.xsl b/xsl/fo/qandaset.xsl
index 7efdaa2a738e8c37141cea3a5b8f43d6ebd28174..a886c104596fa309066efce0a7c330b0c8594f54 100644 (file)
--- a/xsl/fo/qandaset.xsl
+++ b/xsl/fo/qandaset.xsl
@@ -187,15 +187,8 @@
 </xsl:template>
 
 <xsl:template match="qandaentry">
-  <xsl:apply-templates/>
-<!--
-  <fo:block>
-    <xsl:if test="@id">
-      <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </fo:block>
--->
+  <!-- Omit revhistory from fo:list-block because it is a table -->
+  <xsl:apply-templates select="question|answer"/>
 </xsl:template>
 
 <xsl:template match="question">
@@ -246,6 +239,8 @@
           <xsl:apply-templates select="*[local-name(.)!='label']"/>
         </xsl:otherwise>
       </xsl:choose>
+      <!-- Uncomment this line to get revhistory output in the question -->
+      <!-- <xsl:apply-templates select="preceding-sibling::revhistory"/> -->
     </fo:list-item-body>
   </fo:list-item>
 </xsl:template>