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