|
 |
e9144b |
diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl
|
|
|
e9144b |
--- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-06-01 23:36:39.000000000 +0200
|
|
|
e9144b |
+++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200
|
|
|
e9144b |
@@ -1697,45 +1697,99 @@
|
|
|
e9144b |
<xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
</xsl:call-template>
|
|
|
e9144b |
|
|
|
e9144b |
- <fo:table-column column-number="1">
|
|
|
e9144b |
- <xsl:attribute name="column-width">
|
|
|
e9144b |
- <xsl:text>proportional-column-width(</xsl:text>
|
|
|
e9144b |
- <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
- <xsl:with-param name="location">header</xsl:with-param>
|
|
|
e9144b |
- <xsl:with-param name="position" select="$column1"/>
|
|
|
e9144b |
- <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
- <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
- <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
- </xsl:call-template>
|
|
|
e9144b |
- <xsl:text>)</xsl:text>
|
|
|
e9144b |
- </xsl:attribute>
|
|
|
e9144b |
- </fo:table-column>
|
|
|
e9144b |
- <fo:table-column column-number="2">
|
|
|
e9144b |
- <xsl:attribute name="column-width">
|
|
|
e9144b |
- <xsl:text>proportional-column-width(</xsl:text>
|
|
|
e9144b |
- <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
- <xsl:with-param name="location">header</xsl:with-param>
|
|
|
e9144b |
- <xsl:with-param name="position" select="2"/>
|
|
|
e9144b |
- <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
- <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
- <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
- </xsl:call-template>
|
|
|
e9144b |
- <xsl:text>)</xsl:text>
|
|
|
e9144b |
- </xsl:attribute>
|
|
|
e9144b |
- </fo:table-column>
|
|
|
e9144b |
- <fo:table-column column-number="3">
|
|
|
e9144b |
- <xsl:attribute name="column-width">
|
|
|
e9144b |
- <xsl:text>proportional-column-width(</xsl:text>
|
|
|
e9144b |
- <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
- <xsl:with-param name="location">header</xsl:with-param>
|
|
|
e9144b |
- <xsl:with-param name="position" select="$column3"/>
|
|
|
e9144b |
- <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
- <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
- <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
- </xsl:call-template>
|
|
|
e9144b |
- <xsl:text>)</xsl:text>
|
|
|
e9144b |
- </xsl:attribute>
|
|
|
e9144b |
- </fo:table-column>
|
|
|
e9144b |
+ <xsl:choose>
|
|
|
e9144b |
+ <xsl:when test="$passivetex.extensions != 0">
|
|
|
e9144b |
+ <fo:table-column column-number="1">
|
|
|
e9144b |
+ <xsl:attribute name="column-width">
|
|
|
e9144b |
+ <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
+ <xsl:with-param name="location">header</xsl:with-param>
|
|
|
e9144b |
+ <xsl:with-param name="position" select="$column1"/>
|
|
|
e9144b |
+ <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
+ <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
+ </xsl:call-template>
|
|
|
e9144b |
+ <xsl:text>%</xsl:text>
|
|
|
e9144b |
+ </xsl:attribute>
|
|
|
e9144b |
+ </fo:table-column>
|
|
|
e9144b |
+ </xsl:when>
|
|
|
e9144b |
+ <xsl:otherwise>
|
|
|
e9144b |
+ <fo:table-column column-number="1">
|
|
|
e9144b |
+ <xsl:attribute name="column-width">
|
|
|
e9144b |
+ <xsl:text>proportional-column-width(</xsl:text>
|
|
|
e9144b |
+ <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
+ <xsl:with-param name="location">header</xsl:with-param>
|
|
|
e9144b |
+ <xsl:with-param name="position" select="$column1"/>
|
|
|
e9144b |
+ <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
+ <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
+ </xsl:call-template>
|
|
|
e9144b |
+ <xsl:text>)</xsl:text>
|
|
|
e9144b |
+ </xsl:attribute>
|
|
|
e9144b |
+ </fo:table-column>
|
|
|
e9144b |
+ </xsl:otherwise>
|
|
|
e9144b |
+ </xsl:choose>
|
|
|
e9144b |
+ <xsl:choose>
|
|
|
e9144b |
+ <xsl:when test="$passivetex.extensions != 0">
|
|
|
e9144b |
+ <fo:table-column column-number="2">
|
|
|
e9144b |
+ <xsl:attribute name="column-width">
|
|
|
e9144b |
+ <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
+ <xsl:with-param name="location">header</xsl:with-param>
|
|
|
e9144b |
+ <xsl:with-param name="position" select="2"/>
|
|
|
e9144b |
+ <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
+ <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
+ </xsl:call-template>
|
|
|
e9144b |
+ <xsl:text>%</xsl:text>
|
|
|
e9144b |
+ </xsl:attribute>
|
|
|
e9144b |
+ </fo:table-column>
|
|
|
e9144b |
+ </xsl:when>
|
|
|
e9144b |
+ <xsl:otherwise>
|
|
|
e9144b |
+ <fo:table-column column-number="2">
|
|
|
e9144b |
+ <xsl:attribute name="column-width">
|
|
|
e9144b |
+ <xsl:text>proportional-column-width(</xsl:text>
|
|
|
e9144b |
+ <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
+ <xsl:with-param name="location">header</xsl:with-param>
|
|
|
e9144b |
+ <xsl:with-param name="position" select="2"/>
|
|
|
e9144b |
+ <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
+ <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
+ </xsl:call-template>
|
|
|
e9144b |
+ <xsl:text>)</xsl:text>
|
|
|
e9144b |
+ </xsl:attribute>
|
|
|
e9144b |
+ </fo:table-column>
|
|
|
e9144b |
+ </xsl:otherwise>
|
|
|
e9144b |
+ </xsl:choose>
|
|
|
e9144b |
+ <xsl:choose>
|
|
|
e9144b |
+ <xsl:when test="$passivetex.extensions != 0">
|
|
|
e9144b |
+ <fo:table-column column-number="3">
|
|
|
e9144b |
+ <xsl:attribute name="column-width">
|
|
|
e9144b |
+ <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
+ <xsl:with-param name="location">header</xsl:with-param>
|
|
|
e9144b |
+ <xsl:with-param name="position" select="$column3"/>
|
|
|
e9144b |
+ <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
+ <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
+ </xsl:call-template>
|
|
|
e9144b |
+ <xsl:text>%</xsl:text>
|
|
|
e9144b |
+ </xsl:attribute>
|
|
|
e9144b |
+ </fo:table-column>
|
|
|
e9144b |
+ </xsl:when>
|
|
|
e9144b |
+ <xsl:otherwise>
|
|
|
e9144b |
+ <fo:table-column column-number="3">
|
|
|
e9144b |
+ <xsl:attribute name="column-width">
|
|
|
e9144b |
+ <xsl:text>proportional-column-width(</xsl:text>
|
|
|
e9144b |
+ <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
+ <xsl:with-param name="location">header</xsl:with-param>
|
|
|
e9144b |
+ <xsl:with-param name="position" select="$column3"/>
|
|
|
e9144b |
+ <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
+ <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
+ </xsl:call-template>
|
|
|
e9144b |
+ <xsl:text>)</xsl:text>
|
|
|
e9144b |
+ </xsl:attribute>
|
|
|
e9144b |
+ </fo:table-column>
|
|
|
e9144b |
+ </xsl:otherwise>
|
|
|
e9144b |
+ </xsl:choose>
|
|
|
e9144b |
|
|
|
e9144b |
<fo:table-body>
|
|
|
e9144b |
<fo:table-row>
|
|
|
e9144b |
@@ -2021,45 +2066,99 @@
|
|
|
e9144b |
<xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
<xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
</xsl:call-template>
|
|
|
e9144b |
- <fo:table-column column-number="1">
|
|
|
e9144b |
- <xsl:attribute name="column-width">
|
|
|
e9144b |
- <xsl:text>proportional-column-width(</xsl:text>
|
|
|
e9144b |
- <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
- <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
e9144b |
- <xsl:with-param name="position" select="$column1"/>
|
|
|
e9144b |
- <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
- <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
- <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
- </xsl:call-template>
|
|
|
e9144b |
- <xsl:text>)</xsl:text>
|
|
|
e9144b |
- </xsl:attribute>
|
|
|
e9144b |
- </fo:table-column>
|
|
|
e9144b |
- <fo:table-column column-number="2">
|
|
|
e9144b |
- <xsl:attribute name="column-width">
|
|
|
e9144b |
- <xsl:text>proportional-column-width(</xsl:text>
|
|
|
e9144b |
- <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
- <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
e9144b |
- <xsl:with-param name="position" select="2"/>
|
|
|
e9144b |
- <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
- <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
- <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
- </xsl:call-template>
|
|
|
e9144b |
- <xsl:text>)</xsl:text>
|
|
|
e9144b |
- </xsl:attribute>
|
|
|
e9144b |
- </fo:table-column>
|
|
|
e9144b |
- <fo:table-column column-number="3">
|
|
|
e9144b |
- <xsl:attribute name="column-width">
|
|
|
e9144b |
- <xsl:text>proportional-column-width(</xsl:text>
|
|
|
e9144b |
- <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
- <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
e9144b |
- <xsl:with-param name="position" select="$column3"/>
|
|
|
e9144b |
- <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
- <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
- <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
- </xsl:call-template>
|
|
|
e9144b |
- <xsl:text>)</xsl:text>
|
|
|
e9144b |
- </xsl:attribute>
|
|
|
e9144b |
- </fo:table-column>
|
|
|
e9144b |
+ <xsl:choose>
|
|
|
e9144b |
+ <xsl:when test="$passivetex.extensions != 0">
|
|
|
e9144b |
+ <fo:table-column column-number="1">
|
|
|
e9144b |
+ <xsl:attribute name="column-width">
|
|
|
e9144b |
+ <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
+ <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
e9144b |
+ <xsl:with-param name="position" select="$column1"/>
|
|
|
e9144b |
+ <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
+ <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
+ </xsl:call-template>
|
|
|
e9144b |
+ <xsl:text>%</xsl:text>
|
|
|
e9144b |
+ </xsl:attribute>
|
|
|
e9144b |
+ </fo:table-column>
|
|
|
e9144b |
+ </xsl:when>
|
|
|
e9144b |
+ <xsl:otherwise>
|
|
|
e9144b |
+ <fo:table-column column-number="1">
|
|
|
e9144b |
+ <xsl:attribute name="column-width">
|
|
|
e9144b |
+ <xsl:text>proportional-column-width(</xsl:text>
|
|
|
e9144b |
+ <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
+ <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
e9144b |
+ <xsl:with-param name="position" select="$column1"/>
|
|
|
e9144b |
+ <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
+ <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
+ </xsl:call-template>
|
|
|
e9144b |
+ <xsl:text>)</xsl:text>
|
|
|
e9144b |
+ </xsl:attribute>
|
|
|
e9144b |
+ </fo:table-column>
|
|
|
e9144b |
+ </xsl:otherwise>
|
|
|
e9144b |
+ </xsl:choose>
|
|
|
e9144b |
+ <xsl:choose>
|
|
|
e9144b |
+ <xsl:when test="$passivetex.extensions != 0">
|
|
|
e9144b |
+ <fo:table-column column-number="2">
|
|
|
e9144b |
+ <xsl:attribute name="column-width">
|
|
|
e9144b |
+ <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
+ <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
e9144b |
+ <xsl:with-param name="position" select="2"/>
|
|
|
e9144b |
+ <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
+ <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
+ </xsl:call-template>
|
|
|
e9144b |
+ <xsl:text>%</xsl:text>
|
|
|
e9144b |
+ </xsl:attribute>
|
|
|
e9144b |
+ </fo:table-column>
|
|
|
e9144b |
+ </xsl:when>
|
|
|
e9144b |
+ <xsl:otherwise>
|
|
|
e9144b |
+ <fo:table-column column-number="2">
|
|
|
e9144b |
+ <xsl:attribute name="column-width">
|
|
|
e9144b |
+ <xsl:text>proportional-column-width(</xsl:text>
|
|
|
e9144b |
+ <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
+ <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
e9144b |
+ <xsl:with-param name="position" select="2"/>
|
|
|
e9144b |
+ <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
+ <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
+ </xsl:call-template>
|
|
|
e9144b |
+ <xsl:text>)</xsl:text>
|
|
|
e9144b |
+ </xsl:attribute>
|
|
|
e9144b |
+ </fo:table-column>
|
|
|
e9144b |
+ </xsl:otherwise>
|
|
|
e9144b |
+ </xsl:choose>
|
|
|
e9144b |
+ <xsl:choose>
|
|
|
e9144b |
+ <xsl:when test="$passivetex.extensions != 0">
|
|
|
e9144b |
+ <fo:table-column column-number="3">
|
|
|
e9144b |
+ <xsl:attribute name="column-width">
|
|
|
e9144b |
+ <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
+ <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
e9144b |
+ <xsl:with-param name="position" select="$column3"/>
|
|
|
e9144b |
+ <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
+ <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
+ </xsl:call-template>
|
|
|
e9144b |
+ <xsl:text>%</xsl:text>
|
|
|
e9144b |
+ </xsl:attribute>
|
|
|
e9144b |
+ </fo:table-column>
|
|
|
e9144b |
+ </xsl:when>
|
|
|
e9144b |
+ <xsl:otherwise>
|
|
|
e9144b |
+ <fo:table-column column-number="3">
|
|
|
e9144b |
+ <xsl:attribute name="column-width">
|
|
|
e9144b |
+ <xsl:text>proportional-column-width(</xsl:text>
|
|
|
e9144b |
+ <xsl:call-template name="header.footer.width">
|
|
|
e9144b |
+ <xsl:with-param name="location">footer</xsl:with-param>
|
|
|
e9144b |
+ <xsl:with-param name="position" select="$column3"/>
|
|
|
e9144b |
+ <xsl:with-param name="pageclass" select="$pageclass"/>
|
|
|
e9144b |
+ <xsl:with-param name="sequence" select="$sequence"/>
|
|
|
e9144b |
+ <xsl:with-param name="gentext-key" select="$gentext-key"/>
|
|
|
e9144b |
+ </xsl:call-template>
|
|
|
e9144b |
+ <xsl:text>)</xsl:text>
|
|
|
e9144b |
+ </xsl:attribute>
|
|
|
e9144b |
+ </fo:table-column>
|
|
|
e9144b |
+ </xsl:otherwise>
|
|
|
e9144b |
+ </xsl:choose>
|
|
|
e9144b |
|
|
|
e9144b |
<fo:table-body>
|
|
|
e9144b |
<fo:table-row>
|