Home | History | Annotate | Download | only in patches
      1 --- docbook-xsl-1.69.1/fo/pagesetup.xsl.marginleft	2005-08-11 00:40:22.000000000 -0400
      2 +++ docbook-xsl-1.69.1/fo/pagesetup.xsl	2007-02-15 22:25:10.682755000 -0500
      3 @@ -34,29 +34,11 @@
      4       margin-left="{$page.margin.outer} - {$title.margin.left}"
      5  -->
      6  <xsl:param name="margin.left.outer">
      7 -  <xsl:choose>
      8 -    <xsl:when test="$passivetex.extensions != 0">
      9 -      <xsl:value-of select="$page.margin.outer"/>
     10 -    </xsl:when>
     11 -    <xsl:otherwise>
     12 -      <xsl:value-of select="$page.margin.outer"/>
     13 -      <xsl:text> - </xsl:text>
     14 -      <xsl:value-of select="$title.margin.left"/>
     15 -    </xsl:otherwise>
     16 -  </xsl:choose>
     17 +  <xsl:value-of select="$page.margin.outer"/>
     18  </xsl:param>
     19  
     20  <xsl:param name="margin.left.inner">
     21 -  <xsl:choose>
     22 -    <xsl:when test="$passivetex.extensions != 0">
     23 -      <xsl:value-of select="$page.margin.inner"/>
     24 -    </xsl:when>
     25 -    <xsl:otherwise>
     26 -      <xsl:value-of select="$page.margin.inner"/>
     27 -      <xsl:text> - </xsl:text>
     28 -      <xsl:value-of select="$title.margin.left"/>
     29 -    </xsl:otherwise>
     30 -  </xsl:choose>
     31 +  <xsl:value-of select="$page.margin.inner"/>
     32  </xsl:param>
     33  
     34  <xsl:template name="setup.pagemasters">
     35 --- docbook-xsl-1.69.1/fo/lists.xsl.marginleft	2005-05-30 04:07:17.000000000 -0400
     36 +++ docbook-xsl-1.69.1/fo/lists.xsl	2007-02-15 22:25:10.684333000 -0500
     37 @@ -372,7 +372,7 @@
     38        </xsl:when>
     39        <xsl:when test="@termlength">
     40          <xsl:variable name="termlength.is.number">
     41 -          <xsl:value-of select="@termlength + 0"/>
     42 +          <xsl:value-of select="@termlength"/>
     43          </xsl:variable>
     44          <xsl:choose>
     45            <xsl:when test="$termlength.is.number = 'NaN'">
     46 @@ -381,15 +381,7 @@
     47            </xsl:when>
     48            <xsl:otherwise>
     49              <xsl:value-of select="@termlength"/>
     50 -            <xsl:choose>
     51 -              <!-- workaround for passivetex lack of support for non-constant expressions -->
     52 -              <xsl:when test="$passivetex.extensions != 0">
     53 -                <xsl:text>em</xsl:text>
     54 -              </xsl:when>
     55 -              <xsl:otherwise>
     56 -                <xsl:text>em * 0.60</xsl:text>
     57 -              </xsl:otherwise>
     58 -            </xsl:choose>
     59 +            <xsl:text>em</xsl:text>
     60            </xsl:otherwise>
     61          </xsl:choose>
     62        </xsl:when>
     63 @@ -398,15 +390,7 @@
     64            <xsl:with-param name="terms" select="varlistentry/term"/>
     65            <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
     66          </xsl:call-template>
     67 -        <xsl:choose>
     68 -          <!-- workaround for passivetex lack of support for non-constant expressions -->
     69 -          <xsl:when test="$passivetex.extensions != 0">
     70 -            <xsl:text>em</xsl:text>
     71 -          </xsl:when>
     72 -          <xsl:otherwise>
     73 -            <xsl:text>em * 0.60</xsl:text>
     74 -          </xsl:otherwise>
     75 -        </xsl:choose>
     76 +        <xsl:text>em</xsl:text>
     77        </xsl:otherwise>
     78      </xsl:choose>
     79    </xsl:variable>
     80 @@ -420,17 +404,7 @@
     81  
     82    <xsl:variable name="label-separation">1em</xsl:variable>
     83    <xsl:variable name="distance-between-starts">
     84 -    <xsl:choose>
     85 -      <!-- workaround for passivetex lack of support for non-constant expressions -->
     86 -      <xsl:when test="$passivetex.extensions != 0">
     87 -        <xsl:value-of select="$termlength"/>
     88 -      </xsl:when>
     89 -      <xsl:otherwise>
     90 -        <xsl:value-of select="$termlength"/>
     91 -        <xsl:text>+</xsl:text>
     92 -        <xsl:value-of select="$label-separation"/>
     93 -      </xsl:otherwise>
     94 -    </xsl:choose>
     95 +    <xsl:value-of select="$termlength"/>
     96    </xsl:variable>
     97  
     98    <xsl:if test="title">
     99 --- docbook-xsl-1.69.1/fo/param.xsl.marginleft	2005-08-11 02:32:45.000000000 -0400
    100 +++ docbook-xsl-1.69.1/fo/param.xsl	2007-02-15 22:25:10.685524000 -0500
    101 @@ -123,8 +123,8 @@
    102  <xsl:attribute-set name="component.title.properties">
    103    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
    104    <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
    105 -  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
    106 -  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
    107 +  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
    108 +  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
    109    <xsl:attribute name="hyphenate">false</xsl:attribute>
    110    <xsl:attribute name="text-align">
    111      <xsl:choose>
    112