Menu
▾
▴
[docbook-checkins] CVS: xsl/fo formal.xsl,1.41,1.42
|
From: Robert S. <bob...@us...> - 2004-11-04 20:49:17
|
Update of /cvsroot/docbook/xsl/fo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5730 Modified Files: formal.xsl Log Message: Fixed dbfo keep-together PI for tables. Index: formal.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/formal.xsl,v retrieving revision 1.41 retrieving revision 1.42 diff -u -U2 -r1.41 -r1.42 --- formal.xsl 11 Aug 2004 23:50:07 -0000 1.41 +++ formal.xsl 4 Nov 2004 20:48:54 -0000 1.42 @@ -47,8 +47,8 @@ <fo:block id="{$id}" xsl:use-attribute-sets="figure.properties"> - <xsl:if test="$keep.together != ''"> - <xsl:attribute name="keep-together.within-column"><xsl:value-of - select="$keep.together"/></xsl:attribute> - </xsl:if> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <xsl:copy-of select="$content"/> </fo:block> @@ -57,8 +57,8 @@ <fo:block id="{$id}" xsl:use-attribute-sets="example.properties"> - <xsl:if test="$keep.together != ''"> - <xsl:attribute name="keep-together.within-column"><xsl:value-of - select="$keep.together"/></xsl:attribute> - </xsl:if> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <xsl:copy-of select="$content"/> </fo:block> @@ -67,8 +67,8 @@ <fo:block id="{$id}" xsl:use-attribute-sets="equation.properties"> - <xsl:if test="$keep.together != ''"> - <xsl:attribute name="keep-together.within-column"><xsl:value-of - select="$keep.together"/></xsl:attribute> - </xsl:if> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <xsl:copy-of select="$content"/> </fo:block> @@ -77,8 +77,8 @@ <fo:block id="{$id}" xsl:use-attribute-sets="table.properties"> - <xsl:if test="$keep.together != ''"> - <xsl:attribute name="keep-together.within-column"><xsl:value-of - select="$keep.together"/></xsl:attribute> - </xsl:if> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <xsl:copy-of select="$content"/> </fo:block> @@ -87,8 +87,8 @@ <fo:block id="{$id}" xsl:use-attribute-sets="procedure.properties"> - <xsl:if test="$keep.together != ''"> - <xsl:attribute name="keep-together.within-column"><xsl:value-of - select="$keep.together"/></xsl:attribute> - </xsl:if> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <xsl:copy-of select="$content"/> </fo:block> @@ -97,8 +97,8 @@ <fo:block id="{$id}" xsl:use-attribute-sets="formal.object.properties"> - <xsl:if test="$keep.together != ''"> - <xsl:attribute name="keep-together.within-column"><xsl:value-of - select="$keep.together"/></xsl:attribute> - </xsl:if> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"><xsl:value-of + select="$keep.together"/></xsl:attribute> + </xsl:if> <xsl:copy-of select="$content"/> </fo:block> @@ -321,5 +321,5 @@ |mediaobject/videoobject |mediaobject/audioobject - |mediaobject/textobject"/> + |mediaobject/textobject"/> <xsl:variable name="object.index"> @@ -339,7 +339,7 @@ <xsl:when test="$align != ''"> <fo:block> - <xsl:attribute name="text-align"> - <xsl:value-of select="$align"/> - </xsl:attribute> + <xsl:attribute name="text-align"> + <xsl:value-of select="$align"/> + </xsl:attribute> <xsl:call-template name="formal.object"> <xsl:with-param name="placement" select="$placement"/> @@ -534,8 +534,22 @@ </xsl:variable> + <xsl:variable name="keep.together"> + <xsl:call-template name="dbfo-attribute"> + <xsl:with-param name="pis" + select="processing-instruction('dbfo')"/> + <xsl:with-param name="attribute" select="'keep-together'"/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="table.content"> <fo:block id="{$id}" xsl:use-attribute-sets="table.properties"> + <xsl:if test="$keep.together != ''"> + <xsl:attribute name="keep-together.within-column"> + <xsl:value-of select="$keep.together"/> + </xsl:attribute> + </xsl:if> + <xsl:if test="$placement = 'before'"> <xsl:call-template name="formal.object.heading"> @@ -598,8 +612,8 @@ <fo:block-container reference-orientation="90"> <fo:block> - <!-- Such spans won't work in most FO processors since it does - not follow the XSL spec, which says it must appear on - an element that is a direct child of fo:flow. - Some processors relax that requirement, however. --> + <!-- Such spans won't work in most FO processors since it does + not follow the XSL spec, which says it must appear on + an element that is a direct child of fo:flow. + Some processors relax that requirement, however. --> <xsl:attribute name="span"> <xsl:choose> @@ -689,31 +703,31 @@ select=".//colspec[contains(@colwidth, '*')]"/> <fo:block xsl:use-attribute-sets="informaltable.properties"> - <fo:table xsl:use-attribute-sets="table.table.properties"> - <xsl:call-template name="table.frame"/> - <xsl:if test="following-sibling::tgroup"> - <xsl:attribute name="border-bottom-width">0pt</xsl:attribute> - <xsl:attribute name="border-bottom-style">none</xsl:attribute> - <xsl:attribute name="padding-bottom">0pt</xsl:attribute> - <xsl:attribute name="margin-bottom">0pt</xsl:attribute> - <xsl:attribute name="space-after">0pt</xsl:attribute> - <xsl:attribute name="space-after.minimum">0pt</xsl:attribute> - <xsl:attribute name="space-after.optimum">0pt</xsl:attribute> - <xsl:attribute name="space-after.maximum">0pt</xsl:attribute> - </xsl:if> - <xsl:if test="preceding-sibling::tgroup"> - <xsl:attribute name="border-top-width">0pt</xsl:attribute> - <xsl:attribute name="border-top-style">none</xsl:attribute> - <xsl:attribute name="padding-top">0pt</xsl:attribute> - <xsl:attribute name="margin-top">0pt</xsl:attribute> - <xsl:attribute name="space-before">0pt</xsl:attribute> - <xsl:attribute name="space-before.minimum">0pt</xsl:attribute> - <xsl:attribute name="space-before.optimum">0pt</xsl:attribute> - <xsl:attribute name="space-before.maximum">0pt</xsl:attribute> - </xsl:if> - <xsl:if test="count($prop-columns) != 0"> - <xsl:attribute name="table-layout">fixed</xsl:attribute> - </xsl:if> - <xsl:apply-templates select="."/> - </fo:table> + <fo:table xsl:use-attribute-sets="table.table.properties"> + <xsl:call-template name="table.frame"/> + <xsl:if test="following-sibling::tgroup"> + <xsl:attribute name="border-bottom-width">0pt</xsl:attribute> + <xsl:attribute name="border-bottom-style">none</xsl:attribute> + <xsl:attribute name="padding-bottom">0pt</xsl:attribute> + <xsl:attribute name="margin-bottom">0pt</xsl:attribute> + <xsl:attribute name="space-after">0pt</xsl:attribute> + <xsl:attribute name="space-after.minimum">0pt</xsl:attribute> + <xsl:attribute name="space-after.optimum">0pt</xsl:attribute> + <xsl:attribute name="space-after.maximum">0pt</xsl:attribute> + </xsl:if> + <xsl:if test="preceding-sibling::tgroup"> + <xsl:attribute name="border-top-width">0pt</xsl:attribute> + <xsl:attribute name="border-top-style">none</xsl:attribute> + <xsl:attribute name="padding-top">0pt</xsl:attribute> + <xsl:attribute name="margin-top">0pt</xsl:attribute> + <xsl:attribute name="space-before">0pt</xsl:attribute> + <xsl:attribute name="space-before.minimum">0pt</xsl:attribute> + <xsl:attribute name="space-before.optimum">0pt</xsl:attribute> + <xsl:attribute name="space-before.maximum">0pt</xsl:attribute> + </xsl:if> + <xsl:if test="count($prop-columns) != 0"> + <xsl:attribute name="table-layout">fixed</xsl:attribute> + </xsl:if> + <xsl:apply-templates select="."/> + </fo:table> </fo:block> </xsl:for-each> |