docbook-xsl/patches/docbook-xsl-pagesetup.patch

   1 diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl
   2 --- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl    2008-06-01 23:36:39.000000000 +0200
   3 +++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200
   4 @@ -1697,36 +1697,81 @@
   5          <xsl:with-param name="gentext-key" select="$gentext-key"/>
   6        </xsl:call-template>
   7
   8 -      <fo:table-column column-number="1">
   9 -        <xsl:attribute name="column-width">
  10 -          <xsl:text>proportional-column-width(</xsl:text>
  11 -          <xsl:call-template name="header.footer.width">
  12 -            <xsl:with-param name="location">header</xsl:with-param>
  13 -            <xsl:with-param name="position" select="$column1"/>
  14 -          </xsl:call-template>
  15 -          <xsl:text>)</xsl:text>
  16 -        </xsl:attribute>
  17 -      </fo:table-column>
  18 -      <fo:table-column column-number="2">
  19 -        <xsl:attribute name="column-width">
  20 -          <xsl:text>proportional-column-width(</xsl:text>
  21 -          <xsl:call-template name="header.footer.width">
  22 -            <xsl:with-param name="location">header</xsl:with-param>
  23 -            <xsl:with-param name="position" select="2"/>
  24 -          </xsl:call-template>
  25 -          <xsl:text>)</xsl:text>
  26 -        </xsl:attribute>
  27 -      </fo:table-column>
  28 -      <fo:table-column column-number="3">
  29 -        <xsl:attribute name="column-width">
  30 -          <xsl:text>proportional-column-width(</xsl:text>
  31 -          <xsl:call-template name="header.footer.width">
  32 -            <xsl:with-param name="location">header</xsl:with-param>
  33 -            <xsl:with-param name="position" select="$column3"/>
  34 -          </xsl:call-template>
  35 -          <xsl:text>)</xsl:text>
  36 -        </xsl:attribute>
  37 -      </fo:table-column>
  38 +      <xsl:choose>
  39 +        <xsl:when test="$passivetex.extensions != 0">
  40 +          <fo:table-column column-number="1">
  41 +            <xsl:attribute name="column-width">
  42 +              <xsl:call-template name="header.footer.width">
  43 +                <xsl:with-param name="location">header</xsl:with-param>
  44 +                <xsl:with-param name="position" select="$column1"/>
  45 +              </xsl:call-template>
  46 +              <xsl:text>%</xsl:text>
  47 +            </xsl:attribute>
  48 +          </fo:table-column>
  49 +        </xsl:when>
  50 +        <xsl:otherwise>
  51 +          <fo:table-column column-number="1">
  52 +            <xsl:attribute name="column-width">
  53 +              <xsl:text>proportional-column-width(</xsl:text>
  54 +              <xsl:call-template name="header.footer.width">
  55 +                <xsl:with-param name="location">header</xsl:with-param>
  56 +                <xsl:with-param name="position" select="$column1"/>
  57 +              </xsl:call-template>
  58 +              <xsl:text>)</xsl:text>
  59 +            </xsl:attribute>
  60 +          </fo:table-column>
  61 +        </xsl:otherwise>
  62 +                       </xsl:choose>
  63 +      <xsl:choose>
  64 +        <xsl:when test="$passivetex.extensions != 0">
  65 +          <fo:table-column column-number="2">
  66 +            <xsl:attribute name="column-width">
  67 +              <xsl:call-template name="header.footer.width">
  68 +                <xsl:with-param name="location">header</xsl:with-param>
  69 +                <xsl:with-param name="position" select="2"/>
  70 +              </xsl:call-template>
  71 +              <xsl:text>%</xsl:text>
  72 +            </xsl:attribute>
  73 +          </fo:table-column>
  74 +        </xsl:when>
  75 +        <xsl:otherwise>
  76 +          <fo:table-column column-number="2">
  77 +            <xsl:attribute name="column-width">
  78 +              <xsl:text>proportional-column-width(</xsl:text>
  79 +              <xsl:call-template name="header.footer.width">
  80 +                <xsl:with-param name="location">header</xsl:with-param>
  81 +                <xsl:with-param name="position" select="2"/>
  82 +              </xsl:call-template>
  83 +              <xsl:text>)</xsl:text>
  84 +            </xsl:attribute>
  85 +          </fo:table-column>
  86 +        </xsl:otherwise>
  87 +      </xsl:choose>
  88 +      <xsl:choose>
  89 +        <xsl:when test="$passivetex.extensions != 0">
  90 +          <fo:table-column column-number="3">
  91 +            <xsl:attribute name="column-width">
  92 +              <xsl:call-template name="header.footer.width">
  93 +                <xsl:with-param name="location">header</xsl:with-param>
  94 +                <xsl:with-param name="position" select="$column3"/>
  95 +              </xsl:call-template>
  96 +              <xsl:text>%</xsl:text>
  97 +            </xsl:attribute>
  98 +          </fo:table-column>
  99 +        </xsl:when>
 100 +        <xsl:otherwise>
 101 +          <fo:table-column column-number="3">
 102 +            <xsl:attribute name="column-width">
 103 +              <xsl:text>proportional-column-width(</xsl:text>
 104 +              <xsl:call-template name="header.footer.width">
 105 +                <xsl:with-param name="location">header</xsl:with-param>
 106 +                <xsl:with-param name="position" select="$column3"/>
 107 +              </xsl:call-template>
 108 +              <xsl:text>)</xsl:text>
 109 +            </xsl:attribute>
 110 +          </fo:table-column>
 111 +        </xsl:otherwise>
 112 +      </xsl:choose>
 113
 114        <fo:table-body>
 115          <fo:table-row>
 116 @@ -2021,36 +2066,81 @@
 117          <xsl:with-param name="sequence" select="$sequence"/>
 118          <xsl:with-param name="gentext-key" select="$gentext-key"/>
 119        </xsl:call-template>
 120 -      <fo:table-column column-number="1">
 121 -        <xsl:attribute name="column-width">
 122 -          <xsl:text>proportional-column-width(</xsl:text>
 123 -          <xsl:call-template name="header.footer.width">
 124 -            <xsl:with-param name="location">footer</xsl:with-param>
 125 -            <xsl:with-param name="position" select="$column1"/>
 126 -          </xsl:call-template>
 127 -          <xsl:text>)</xsl:text>
 128 -        </xsl:attribute>
 129 -      </fo:table-column>
 130 -      <fo:table-column column-number="2">
 131 -        <xsl:attribute name="column-width">
 132 -          <xsl:text>proportional-column-width(</xsl:text>
 133 -          <xsl:call-template name="header.footer.width">
 134 -            <xsl:with-param name="location">footer</xsl:with-param>
 135 -            <xsl:with-param name="position" select="2"/>
 136 -          </xsl:call-template>
 137 -          <xsl:text>)</xsl:text>
 138 -        </xsl:attribute>
 139 -      </fo:table-column>
 140 -      <fo:table-column column-number="3">
 141 -        <xsl:attribute name="column-width">
 142 -          <xsl:text>proportional-column-width(</xsl:text>
 143 -          <xsl:call-template name="header.footer.width">
 144 -            <xsl:with-param name="location">footer</xsl:with-param>
 145 -            <xsl:with-param name="position" select="$column3"/>
 146 -          </xsl:call-template>
 147 -          <xsl:text>)</xsl:text>
 148 -        </xsl:attribute>
 149 -      </fo:table-column>
 150 +      <xsl:choose>
 151 +        <xsl:when test="$passivetex.extensions != 0">
 152 +          <fo:table-column column-number="1">
 153 +            <xsl:attribute name="column-width">
 154 +              <xsl:call-template name="header.footer.width">
 155 +                <xsl:with-param name="location">footer</xsl:with-param>
 156 +                <xsl:with-param name="position" select="$column1"/>
 157 +              </xsl:call-template>
 158 +              <xsl:text>%</xsl:text>
 159 +            </xsl:attribute>
 160 +          </fo:table-column>
 161 +        </xsl:when>
 162 +        <xsl:otherwise>
 163 +          <fo:table-column column-number="1">
 164 +            <xsl:attribute name="column-width">
 165 +              <xsl:text>proportional-column-width(</xsl:text>
 166 +              <xsl:call-template name="header.footer.width">
 167 +                <xsl:with-param name="location">footer</xsl:with-param>
 168 +                <xsl:with-param name="position" select="$column1"/>
 169 +              </xsl:call-template>
 170 +              <xsl:text>)</xsl:text>
 171 +            </xsl:attribute>
 172 +          </fo:table-column>
 173 +        </xsl:otherwise>
 174 +      </xsl:choose>
 175 +      <xsl:choose>
 176 +        <xsl:when test="$passivetex.extensions != 0">
 177 +          <fo:table-column column-number="2">
 178 +            <xsl:attribute name="column-width">
 179 +              <xsl:call-template name="header.footer.width">
 180 +                <xsl:with-param name="location">footer</xsl:with-param>
 181 +                <xsl:with-param name="position" select="2"/>
 182 +              </xsl:call-template>
 183 +              <xsl:text>%</xsl:text>
 184 +            </xsl:attribute>
 185 +          </fo:table-column>
 186 +        </xsl:when>
 187 +        <xsl:otherwise>
 188 +          <fo:table-column column-number="2">
 189 +            <xsl:attribute name="column-width">
 190 +              <xsl:text>proportional-column-width(</xsl:text>
 191 +              <xsl:call-template name="header.footer.width">
 192 +                <xsl:with-param name="location">footer</xsl:with-param>
 193 +                <xsl:with-param name="position" select="2"/>
 194 +              </xsl:call-template>
 195 +              <xsl:text>)</xsl:text>
 196 +            </xsl:attribute>
 197 +          </fo:table-column>
 198 +        </xsl:otherwise>
 199 +      </xsl:choose>
 200 +      <xsl:choose>
 201 +        <xsl:when test="$passivetex.extensions != 0">
 202 +          <fo:table-column column-number="3">
 203 +            <xsl:attribute name="column-width">
 204 +              <xsl:call-template name="header.footer.width">
 205 +                <xsl:with-param name="location">footer</xsl:with-param>
 206 +                <xsl:with-param name="position" select="$column3"/>
 207 +              </xsl:call-template>
 208 +              <xsl:text>%</xsl:text>
 209 +            </xsl:attribute>
 210 +          </fo:table-column>
 211 +        </xsl:when>
 212 +        <xsl:otherwise>
 213 +          <fo:table-column column-number="3">
 214 +            <xsl:attribute name="column-width">
 215 +              <xsl:text>proportional-column-width(</xsl:text>
 216 +              <xsl:call-template name="header.footer.width">
 217 +                <xsl:with-param name="location">footer</xsl:with-param>
 218 +                <xsl:with-param name="position" select="$column3"/>
 219 +              </xsl:call-template>
 220 +              <xsl:text>)</xsl:text>
 221 +            </xsl:attribute>
 222 +          </fo:table-column>
 223 +        </xsl:otherwise>
 224 +      </xsl:choose>
 225
 226        <fo:table-body>
 227          <fo:table-row>