Fixed vertical spacing between glossterm and glossdef when

glossary.as.blocks is set.

diff --git a/xsl/fo/glossary.xsl b/xsl/fo/glossary.xsl
index b3c1b64afed26210b5d774305371803002335b61..838d377efe4582690a052b28d5563062cfe5f87c 100644 (file)
--- a/xsl/fo/glossary.xsl
+++ b/xsl/fo/glossary.xsl
@@ -707,7 +707,7 @@ GlossEntry ::=
     <xsl:call-template name="object.id"/>
   </xsl:variable>
 
-  <fo:block xsl:use-attribute-sets="list.block.spacing"
+  <fo:block xsl:use-attribute-sets="list.item.spacing"
          keep-with-next.within-column="always" 
          keep-together.within-column="always">
     <xsl:call-template name="anchor">
@@ -801,7 +801,8 @@ GlossEntry ::=
 </xsl:template>
 
 <xsl:template match="glossentry/glossdef" mode="glossary.as.blocks">
-  <xsl:apply-templates select="*[local-name(.) != 'glossseealso']"/>
+  <xsl:apply-templates select="*[local-name(.) != 'glossseealso']"
+                       mode="glossary.as.blocks"/>
   <xsl:if test="glossseealso">
     <fo:block>
       <xsl:call-template name="gentext.template">
@@ -820,6 +821,11 @@ GlossEntry ::=
   </fo:block>
 </xsl:template>
 
+<!-- Handle any other glossdef content normally -->
+<xsl:template match="*" mode="glossary.as.blocks">
+  <xsl:apply-templates select="." />
+</xsl:template>
+
 <xsl:template match="glossseealso" mode="glossary.as.blocks">
   <xsl:variable name="otherterm" select="@otherterm"/>
   <xsl:variable name="targets" select="//node()[@id=$otherterm]"/>