diff options
Diffstat (limited to 'fo/table.xsl')
| -rw-r--r-- | fo/table.xsl | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/fo/table.xsl b/fo/table.xsl index 3a720af..d639efe 100644 --- a/fo/table.xsl +++ b/fo/table.xsl @@ -13,7 +13,7 @@ <xsl:include href="../common/table.xsl"/> <!-- ******************************************************************** - $Id: table.xsl 9345 2012-05-11 03:46:46Z bobstayton $ + $Id: table.xsl 9666 2012-11-14 04:42:56Z bobstayton $ ******************************************************************** This file is part of the XSL DocBook Stylesheet distribution. @@ -27,7 +27,7 @@ <info> <title>Formatting Object Table Reference</title> <releaseinfo role="meta"> - $Id: table.xsl 9345 2012-05-11 03:46:46Z bobstayton $ + $Id: table.xsl 9666 2012-11-14 04:42:56Z bobstayton $ </releaseinfo> </info> <partintro xml:id="partintro"> @@ -173,6 +173,11 @@ <xsl:otherwise> <fo:block id="{$id}" xsl:use-attribute-sets="informaltable.properties"> + <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="$table.layout"/> <xsl:call-template name="table.footnote.block"/> </fo:block> @@ -197,8 +202,7 @@ <xsl:param name="table.block"/> <xsl:choose> <xsl:when test="@orient='land' and - $fop.extensions = 0 and - $passivetex.extensions = 0" > + $fop.extensions = 0" > <fo:block-container reference-orientation="90" padding="6pt" xsl:use-attribute-sets="list.block.spacing"> @@ -508,8 +512,7 @@ select=".//colspec[contains(@colwidth, '*')]"/> <xsl:if test="count($prop-columns) != 0 or $fop.extensions != 0 or - $fop1.extensions != 0 or - $passivetex.extensions != 0"> + $fop1.extensions != 0"> <xsl:attribute name="table-layout">fixed</xsl:attribute> </xsl:if> @@ -642,8 +645,7 @@ <xsl:choose> <!-- These processors don't support table-layout="auto" --> <xsl:when test="$fop.extensions != 0 or - $fop1.extensions != 0 or - $passivetex.extensions != 0"> + $fop1.extensions != 0"> <xsl:text>100%</xsl:text> </xsl:when> <!-- Proportional columns imply 100% width --> @@ -672,7 +674,7 @@ <fo:table-header start-indent="0pt" end-indent="0pt"> <xsl:choose> <!-- Use recursion if @morerows is used --> - <xsl:when test="row/entry/@morerows|ro/entrytbl/@morerows"> + <xsl:when test="row/entry/@morerows|row/entrytbl/@morerows"> <xsl:apply-templates select="row[1]"> <xsl:with-param name="spans"> <xsl:call-template name="blank.spans"> @@ -702,7 +704,7 @@ <fo:table-footer start-indent="0pt" end-indent="0pt"> <xsl:choose> <!-- Use recursion if @morerows is used --> - <xsl:when test="row/entry/@morerows|ro/entrytbl/@morerows"> + <xsl:when test="row/entry/@morerows|row/entrytbl/@morerows"> <xsl:apply-templates select="row[1]"> <xsl:with-param name="spans"> <xsl:call-template name="blank.spans"> @@ -732,7 +734,7 @@ <fo:table-body start-indent="0pt" end-indent="0pt"> <xsl:choose> <!-- Use recursion if @morerows is used --> - <xsl:when test="row/entry/@morerows|ro/entrytbl/@morerows"> + <xsl:when test="row/entry/@morerows|row/entrytbl/@morerows"> <xsl:apply-templates select="row[1]"> <xsl:with-param name="spans"> <xsl:call-template name="blank.spans"> @@ -1132,7 +1134,7 @@ --> <xsl:choose> - <xsl:when test="$fop.extensions = 0 and $passivetex.extensions = 0 + <xsl:when test="$fop.extensions = 0 and $orientation != ''"> <fo:block-container reference-orientation="{$orientation}"> <xsl:if test="$rotated-width != ''"> |