[docbook-checkins] CVS: xsl/fo formal.xsl,1.2,1.3 param.xsl,1.6,1.7

[Norman W. <nw...@us...>]

Update of /cvsroot/docbook/xsl/fo
In directory usw-pr-cvs1:/tmp/cvs-serv8790

Modified Files:
	formal.xsl param.xsl 
Log Message:
Fix formatting of formal object titles.

Index: formal.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/formal.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** formal.xsl	2001/04/15 21:28:50	1.2
--- formal.xsl	2001/06/19 12:53:41	1.3
***************
*** 20,35 ****
  
    <fo:block id="{$id}"
!             space-before.minimum="1em"
!             space-before.optimum="1.5em"
!             space-before.maximum="2em"
!             space-after.minimum="1em"
!             space-after.optimum="1.5em"
!             space-after.maximum="2em"
!             keep-with-previous.within-column="always">
!     <xsl:call-template name="formal.object.heading">
!        <xsl:with-param name="title">
!          <xsl:apply-templates select="." mode="title.markup"/>
!        </xsl:with-param>
!     </xsl:call-template>
      <xsl:apply-templates/>
    </fo:block>
--- 20,25 ----
  
    <fo:block id="{$id}"
!             xsl:use-attribute-sets="formal.object.properties">
!     <xsl:call-template name="formal.object.heading"/>
      <xsl:apply-templates/>
    </fo:block>
***************
*** 39,43 ****
    <xsl:param name="title"></xsl:param>
    <fo:block xsl:use-attribute-sets="formal.title.properties">
!     <xsl:copy-of select="$title"/>
    </fo:block>
  </xsl:template>
--- 29,33 ----
    <xsl:param name="title"></xsl:param>
    <fo:block xsl:use-attribute-sets="formal.title.properties">
!     <xsl:apply-templates select="." mode="object.title.markup"/>
    </fo:block>
  </xsl:template>
***************
*** 72,90 ****
  
    <fo:table-and-caption id="{$id}"
!       keep-together.within-column="always"
!       space-before.minimum="0.8em"
!       space-before.optimum="1em"
!       space-before.maximum="1.2em"
!       space-after.minimum="0.8em"
!       space-after.optimum="1em"
!       space-after.maximum="1.2em">
      <fo:table-caption>
!       <fo:block font-weight='bold'
!           space-after.minimum="0.2em"
!           space-after.optimum="0.5em"
!           space-after.maximum="0.8em"
!           keep-with-next.within-column="always"
!           hyphenate="false">
!          <xsl:apply-templates select="." mode="title.markup"/>
        </fo:block>
      </fo:table-caption>
--- 62,69 ----
  
    <fo:table-and-caption id="{$id}"
!                         xsl:use-attribute-sets="formal.object.properties">
      <fo:table-caption>
!       <fo:block xsl:use-attribute-sets="formal.title.properties">
!         <xsl:apply-templates select="." mode="object.title.markup"/>
        </fo:block>
      </fo:table-caption>

Index: param.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/param.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** param.xsl	2001/06/13 21:47:55	1.6
--- param.xsl	2001/06/19 12:53:41	1.7
***************
*** 141,144 ****
--- 141,155 ----
  
  <!-- ==================================================================== -->
+ <xsl:attribute-set name="formal.object.properties">
+   <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
+   <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+   <xsl:attribute name="space-before.maximum">2em</xsl:attribute>
+   <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute>
+   <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
+   <xsl:attribute name="space-after.maximum">2em</xsl:attribute>
+   <xsl:attribute name="keep-with-previous.within-column">always</xsl:attribute>
+ </xsl:attribute-set>
+ 
+ <!-- ==================================================================== -->
  <xsl:attribute-set name="formal.title.properties"
                     use-attribute-sets="normal.para.spacing">