From 78800fa2068e472076fba36fd09025c93facda9b Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Fri, 5 Apr 2013 16:50:38 +0000
Subject: [PATCH] Fix bug in question template that output empty
 list-item-label when defaultlabel = 'none'.

---
 xsl/fo/qandaset.xsl | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/xsl/fo/qandaset.xsl b/xsl/fo/qandaset.xsl
index f6c4d3948..5e81d285f 100644
--- a/xsl/fo/qandaset.xsl
+++ b/xsl/fo/qandaset.xsl
@@ -259,11 +259,16 @@
 
   <fo:list-item id="{$entry.id}" xsl:use-attribute-sets="list.item.spacing">
     <fo:list-item-label id="{$id}" end-indent="label-end()">
-        <xsl:if test="string-length($label.content) &gt; 0">
-			<fo:block font-weight="bold">
-			  <xsl:copy-of select="$label.content"/>          
-			</fo:block>
-        </xsl:if>
+      <xsl:choose>
+        <xsl:when test="string-length($label.content) &gt; 0">
+          <fo:block font-weight="bold">
+            <xsl:copy-of select="$label.content"/>          
+          </fo:block>
+        </xsl:when>
+        <xsl:otherwise>
+          <fo:block/>
+        </xsl:otherwise>
+      </xsl:choose>
     </fo:list-item-label>
     <fo:list-item-body start-indent="body-start()">
       <xsl:choose>
@@ -302,12 +307,12 @@
     <fo:list-item-label id="{$id}" end-indent="label-end()">
       <xsl:choose>
         <xsl:when test="string-length($answer.label) &gt; 0">
-			<fo:block font-weight="bold">
-			  <xsl:copy-of select="$answer.label"/>
-			</fo:block>
+          <fo:block font-weight="bold">
+            <xsl:copy-of select="$answer.label"/>
+          </fo:block>
         </xsl:when>
         <xsl:otherwise>
-			<fo:block/>
+          <fo:block/>
         </xsl:otherwise>
       </xsl:choose>
     </fo:list-item-label>
-- 
2.50.1