2007-12-03 15:36:43 +00:00
|
|
|
diff -urp docbook-xsl-1.73.2-orig/fo/pagesetup.xsl docbook-xsl-1.73.2/fo/pagesetup.xsl
|
|
|
|
--- docbook-xsl-1.73.2-orig/fo/pagesetup.xsl 2007-12-03 14:54:28.000000000 +0100
|
|
|
|
+++ docbook-xsl-1.73.2/fo/pagesetup.xsl 2007-12-03 15:24:32.000000000 +0100
|
|
|
|
@@ -1679,37 +1679,82 @@
|
|
|
|
<xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
|
</xsl:call-template>
|
|
|
|
|
|
|
|
- <fo:table-column column-number="1">
|
|
|
|
- <xsl:attribute name="column-width">
|
2006-01-03 13:47:31 +00:00
|
|
|
- <xsl:text>proportional-column-width(</xsl:text>
|
2007-12-03 15:36:43 +00:00
|
|
|
- <xsl:call-template name="header.footer.width">
|
|
|
|
- <xsl:with-param name="location">header</xsl:with-param>
|
|
|
|
- <xsl:with-param name="position" select="$column1"/>
|
|
|
|
- </xsl:call-template>
|
2006-01-03 13:47:31 +00:00
|
|
|
- <xsl:text>)</xsl:text>
|
2007-12-03 15:36:43 +00:00
|
|
|
- </xsl:attribute>
|
|
|
|
- </fo:table-column>
|
|
|
|
- <fo:table-column column-number="2">
|
|
|
|
- <xsl:attribute name="column-width">
|
2006-01-03 13:47:31 +00:00
|
|
|
- <xsl:text>proportional-column-width(</xsl:text>
|
2007-12-03 15:36:43 +00:00
|
|
|
- <xsl:call-template name="header.footer.width">
|
|
|
|
- <xsl:with-param name="location">header</xsl:with-param>
|
|
|
|
- <xsl:with-param name="position" select="2"/>
|
|
|
|
- </xsl:call-template>
|
2006-01-03 13:47:31 +00:00
|
|
|
- <xsl:text>)</xsl:text>
|
2007-12-03 15:36:43 +00:00
|
|
|
- </xsl:attribute>
|
|
|
|
- </fo:table-column>
|
|
|
|
- <fo:table-column column-number="3">
|
|
|
|
- <xsl:attribute name="column-width">
|
2006-01-03 13:47:31 +00:00
|
|
|
- <xsl:text>proportional-column-width(</xsl:text>
|
2007-12-03 15:36:43 +00:00
|
|
|
- <xsl:call-template name="header.footer.width">
|
|
|
|
- <xsl:with-param name="location">header</xsl:with-param>
|
|
|
|
- <xsl:with-param name="position" select="$column3"/>
|
|
|
|
- </xsl:call-template>
|
2006-01-03 13:47:31 +00:00
|
|
|
- <xsl:text>)</xsl:text>
|
2007-12-03 15:36:43 +00:00
|
|
|
- </xsl:attribute>
|
|
|
|
- </fo:table-column>
|
|
|
|
+ <xsl:choose>
|
|
|
|
+ <xsl:when test="$passivetex.extensions != 0">
|
|
|
|
+ <fo:table-column column-number="1">
|
|
|
|
+ <xsl:attribute name="column-width">
|
|
|
|
+ <xsl:call-template name="header.footer.width">
|
|
|
|
+ <xsl:with-param name="location">header</xsl:with-param>
|
|
|
|
+ <xsl:with-param name="position" select="$column1"/>
|
|
|
|
+ </xsl:call-template>
|
|
|
|
+ <xsl:text>%</xsl:text>
|
|
|
|
+ </xsl:attribute>
|
|
|
|
+ </fo:table-column>
|
|
|
|
+ </xsl:when>
|
|
|
|
+ <xsl:otherwise>
|
|
|
|
+ <fo:table-column column-number="1">
|
|
|
|
+ <xsl:attribute name="column-width">
|
|
|
|
+ <xsl:text>proportional-column-width(</xsl:text>
|
|
|
|
+ <xsl:call-template name="header.footer.width">
|
|
|
|
+ <xsl:with-param name="location">header</xsl:with-param>
|
|
|
|
+ <xsl:with-param name="position" select="$column1"/>
|
|
|
|
+ </xsl:call-template>
|
|
|
|
+ <xsl:text>)</xsl:text>
|
|
|
|
+ </xsl:attribute>
|
|
|
|
+ </fo:table-column>
|
|
|
|
+ </xsl:otherwise>
|
|
|
|
+ </xsl:choose>
|
|
|
|
+ <xsl:choose>
|
|
|
|
+ <xsl:when test="$passivetex.extensions != 0">
|
|
|
|
+ <fo:table-column column-number="2">
|
|
|
|
+ <xsl:attribute name="column-width">
|
|
|
|
+ <xsl:call-template name="header.footer.width">
|
|
|
|
+ <xsl:with-param name="location">header</xsl:with-param>
|
|
|
|
+ <xsl:with-param name="position" select="2"/>
|
|
|
|
+ </xsl:call-template>
|
|
|
|
+ <xsl:text>%</xsl:text>
|
|
|
|
+ </xsl:attribute>
|
|
|
|
+ </fo:table-column>
|
|
|
|
+ </xsl:when>
|
|
|
|
+ <xsl:otherwise>
|
|
|
|
+ <fo:table-column column-number="2">
|
|
|
|
+ <xsl:attribute name="column-width">
|
|
|
|
+ <xsl:text>proportional-column-width(</xsl:text>
|
|
|
|
+ <xsl:call-template name="header.footer.width">
|
|
|
|
+ <xsl:with-param name="location">header</xsl:with-param>
|
|
|
|
+ <xsl:with-param name="position" select="2"/>
|
|
|
|
+ </xsl:call-template>
|
|
|
|
+ <xsl:text>)</xsl:text>
|
|
|
|
+ </xsl:attribute>
|
|
|
|
+ </fo:table-column>
|
|
|
|
+ </xsl:otherwise>
|
|
|
|
+ </xsl:choose>
|
|
|
|
+ <xsl:choose>
|
|
|
|
+ <xsl:when test="$passivetex.extensions != 0">
|
|
|
|
+ <fo:table-column column-number="3">
|
|
|
|
+ <xsl:attribute name="column-width">
|
|
|
|
+ <xsl:call-template name="header.footer.width">
|
|
|
|
+ <xsl:with-param name="location">header</xsl:with-param>
|
|
|
|
+ <xsl:with-param name="position" select="$column3"/>
|
|
|
|
+ </xsl:call-template>
|
|
|
|
+ <xsl:text>%</xsl:text>
|
|
|
|
+ </xsl:attribute>
|
|
|
|
+ </fo:table-column>
|
|
|
|
+ </xsl:when>
|
|
|
|
+ <xsl:otherwise>
|
|
|
|
+ <fo:table-column column-number="3">
|
|
|
|
+ <xsl:attribute name="column-width">
|
|
|
|
+ <xsl:text>proportional-column-width(</xsl:text>
|
|
|
|
+ <xsl:call-template name="header.footer.width">
|
|
|
|
+ <xsl:with-param name="location">header</xsl:with-param>
|
|
|
|
+ <xsl:with-param name="position" select="$column3"/>
|
|
|
|
+ </xsl:call-template>
|
|
|
|
+ <xsl:text>)</xsl:text>
|
|
|
|
+ </xsl:attribute>
|
|
|
|
+ </fo:table-column>
|
|
|
|
+ </xsl:otherwise>
|
|
|
|
+ </xsl:choose>
|
|
|
|
|
|
|
|
<fo:table-body>
|
|
|
|
<fo:table-row>
|
|
|
|
<xsl:attribute name="block-progression-dimension.minimum">
|
|
|
|
@@ -2003,36 +2046,81 @@
|
|
|
|
<xsl:with-param name="sequence" select="$sequence"/>
|
|
|
|
<xsl:with-param name="gentext-key" select="$gentext-key"/>
|
2006-01-03 13:47:31 +00:00
|
|
|
</xsl:call-template>
|
2007-12-03 15:36:43 +00:00
|
|
|
- <fo:table-column column-number="1">
|
|
|
|
- <xsl:attribute name="column-width">
|
2006-01-03 13:47:31 +00:00
|
|
|
- <xsl:text>proportional-column-width(</xsl:text>
|
2007-12-03 15:36:43 +00:00
|
|
|
- <xsl:call-template name="header.footer.width">
|
|
|
|
- <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
|
- <xsl:with-param name="position" select="$column1"/>
|
|
|
|
- </xsl:call-template>
|
2006-01-03 13:47:31 +00:00
|
|
|
- <xsl:text>)</xsl:text>
|
2007-12-03 15:36:43 +00:00
|
|
|
- </xsl:attribute>
|
|
|
|
- </fo:table-column>
|
|
|
|
- <fo:table-column column-number="2">
|
|
|
|
- <xsl:attribute name="column-width">
|
2006-01-03 13:47:31 +00:00
|
|
|
- <xsl:text>proportional-column-width(</xsl:text>
|
2007-12-03 15:36:43 +00:00
|
|
|
- <xsl:call-template name="header.footer.width">
|
|
|
|
- <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
|
- <xsl:with-param name="position" select="2"/>
|
|
|
|
- </xsl:call-template>
|
2006-01-03 13:47:31 +00:00
|
|
|
- <xsl:text>)</xsl:text>
|
2007-12-03 15:36:43 +00:00
|
|
|
- </xsl:attribute>
|
|
|
|
- </fo:table-column>
|
|
|
|
- <fo:table-column column-number="3">
|
|
|
|
- <xsl:attribute name="column-width">
|
2006-01-03 13:47:31 +00:00
|
|
|
- <xsl:text>proportional-column-width(</xsl:text>
|
2007-12-03 15:36:43 +00:00
|
|
|
- <xsl:call-template name="header.footer.width">
|
|
|
|
- <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
|
- <xsl:with-param name="position" select="$column3"/>
|
|
|
|
- </xsl:call-template>
|
2006-01-03 13:47:31 +00:00
|
|
|
- <xsl:text>)</xsl:text>
|
2007-12-03 15:36:43 +00:00
|
|
|
- </xsl:attribute>
|
|
|
|
- </fo:table-column>
|
|
|
|
+ <xsl:choose>
|
|
|
|
+ <xsl:when test="$passivetex.extensions != 0">
|
|
|
|
+ <fo:table-column column-number="1">
|
|
|
|
+ <xsl:attribute name="column-width">
|
|
|
|
+ <xsl:call-template name="header.footer.width">
|
|
|
|
+ <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
|
+ <xsl:with-param name="position" select="$column1"/>
|
|
|
|
+ </xsl:call-template>
|
|
|
|
+ <xsl:text>%</xsl:text>
|
|
|
|
+ </xsl:attribute>
|
|
|
|
+ </fo:table-column>
|
|
|
|
+ </xsl:when>
|
|
|
|
+ <xsl:otherwise>
|
|
|
|
+ <fo:table-column column-number="1">
|
|
|
|
+ <xsl:attribute name="column-width">
|
|
|
|
+ <xsl:text>proportional-column-width(</xsl:text>
|
|
|
|
+ <xsl:call-template name="header.footer.width">
|
|
|
|
+ <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
|
+ <xsl:with-param name="position" select="$column1"/>
|
|
|
|
+ </xsl:call-template>
|
|
|
|
+ <xsl:text>)</xsl:text>
|
|
|
|
+ </xsl:attribute>
|
|
|
|
+ </fo:table-column>
|
|
|
|
+ </xsl:otherwise>
|
|
|
|
+ </xsl:choose>
|
|
|
|
+ <xsl:choose>
|
|
|
|
+ <xsl:when test="$passivetex.extensions != 0">
|
|
|
|
+ <fo:table-column column-number="2">
|
|
|
|
+ <xsl:attribute name="column-width">
|
|
|
|
+ <xsl:call-template name="header.footer.width">
|
|
|
|
+ <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
|
+ <xsl:with-param name="position" select="2"/>
|
|
|
|
+ </xsl:call-template>
|
|
|
|
+ <xsl:text>%</xsl:text>
|
|
|
|
+ </xsl:attribute>
|
|
|
|
+ </fo:table-column>
|
|
|
|
+ </xsl:when>
|
|
|
|
+ <xsl:otherwise>
|
|
|
|
+ <fo:table-column column-number="2">
|
|
|
|
+ <xsl:attribute name="column-width">
|
|
|
|
+ <xsl:text>proportional-column-width(</xsl:text>
|
|
|
|
+ <xsl:call-template name="header.footer.width">
|
|
|
|
+ <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
|
+ <xsl:with-param name="position" select="2"/>
|
|
|
|
+ </xsl:call-template>
|
|
|
|
+ <xsl:text>)</xsl:text>
|
|
|
|
+ </xsl:attribute>
|
|
|
|
+ </fo:table-column>
|
|
|
|
+ </xsl:otherwise>
|
|
|
|
+ </xsl:choose>
|
|
|
|
+ <xsl:choose>
|
|
|
|
+ <xsl:when test="$passivetex.extensions != 0">
|
|
|
|
+ <fo:table-column column-number="3">
|
|
|
|
+ <xsl:attribute name="column-width">
|
|
|
|
+ <xsl:call-template name="header.footer.width">
|
|
|
|
+ <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
|
+ <xsl:with-param name="position" select="$column3"/>
|
|
|
|
+ </xsl:call-template>
|
|
|
|
+ <xsl:text>%</xsl:text>
|
|
|
|
+ </xsl:attribute>
|
|
|
|
+ </fo:table-column>
|
|
|
|
+ </xsl:when>
|
|
|
|
+ <xsl:otherwise>
|
|
|
|
+ <fo:table-column column-number="3">
|
|
|
|
+ <xsl:attribute name="column-width">
|
|
|
|
+ <xsl:text>proportional-column-width(</xsl:text>
|
|
|
|
+ <xsl:call-template name="header.footer.width">
|
|
|
|
+ <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
|
+ <xsl:with-param name="position" select="$column3"/>
|
|
|
|
+ </xsl:call-template>
|
|
|
|
+ <xsl:text>)</xsl:text>
|
|
|
|
+ </xsl:attribute>
|
|
|
|
+ </fo:table-column>
|
|
|
|
+ </xsl:otherwise>
|
|
|
|
+ </xsl:choose>
|
2006-01-03 13:47:31 +00:00
|
|
|
|
2007-12-03 15:36:43 +00:00
|
|
|
<fo:table-body>
|
|
|
|
<fo:table-row>
|