[docbook-checkins] CVS: xsl/fo refentry.xsl,1.27,1.28 synop.xsl,1.12,1.13

[Michael S. <xm...@us...>]

Update of /cvsroot/docbook/xsl/fo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22040/fo

Modified Files:
	refentry.xsl synop.xsl 
Log Message:
Generate localized title for Refsynopsisdiv if no appropriate
Title descendant found in source. Closes #1212398. This change
makes behavior for the Synopsis title consistent with the behavior
of HTML and manpages output.

Also, added xsl:use-attribute-sets="normal.para.spacing" to block
generated for Cmdsynopsis output. Previously, that block had no
spacing at all specified, which resulted it being crammed up to
closely to the Synopsis head.


Index: refentry.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/refentry.xsl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -U2 -r1.27 -r1.28
--- refentry.xsl	1 Jun 2005 10:25:16 -0000	1.27
+++ refentry.xsl	29 Sep 2005 15:00:45 -0000	1.28
@@ -466,4 +466,29 @@
 
   <fo:block id="{$id}">
+    <xsl:if test="not(refsynopsisdivinfo/title|docinfo/title|info/title|title)">
+      <!-- * if we there is no appropriate title for this Refsynopsisdiv, -->
+      <!-- * then we need to call format.refentry.subheading to generate one -->
+      <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
+                xsl:use-attribute-sets="refsynopsisdiv.titlepage.recto.style"
+                font-family="{$title.fontset}">
+        <!-- Contents of what is now the format.refentry.subheading -->
+        <!-- template were formerly intended to be used only to -->
+        <!-- process those subsections of Refentry that have "real" -->
+        <!-- title children. So as a kludge to get around the fact -->
+        <!-- that the template still basically "expects" to be -->
+        <!-- processing that kind of a node, when we call the -->
+        <!-- template to process generated titles, we must call it -->
+        <!-- with values for the "offset" and "section" parameters -->
+        <!-- that are different from the default values in the -->
+        <!-- format.refentry.subheading template itself. Because -->
+        <!-- those defaults are the values appropriate for processing -->
+        <!-- "real" title nodes. -->
+        <xsl:call-template name="format.refentry.subheading">
+          <xsl:with-param name="section" select="parent::*"/>
+          <xsl:with-param name="offset" select="1"/>
+          <xsl:with-param name="gentext.key" select="'RefSynopsisDiv'"/>
+        </xsl:call-template>
+      </fo:block>
+    </xsl:if>
     <xsl:call-template name="refsynopsisdiv.titlepage"/>
     <xsl:apply-templates/>

Index: synop.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/synop.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -U2 -r1.12 -r1.13
--- synop.xsl	27 Sep 2002 13:03:54 -0000	1.12
+++ synop.xsl	29 Sep 2005 15:00:45 -0000	1.13
@@ -25,5 +25,5 @@
 
 <xsl:template match="cmdsynopsis">
-  <fo:block>
+  <fo:block xsl:use-attribute-sets="normal.para.spacing">
     <xsl:apply-templates/>
   </fo:block>