New upstream release 1.78.0, rediffed marginleft patch
This commit is contained in:
parent
8df7892c49
commit
ef88acae36
2
.gitignore
vendored
2
.gitignore
vendored
@ -6,3 +6,5 @@ docbook-xsl-doc-1.75.2.tar.bz2
|
||||
/docbook-xsl-doc-1.76.1.tar.bz2
|
||||
/docbook-xsl-1.77.1.tar.bz2
|
||||
/docbook-xsl-doc-1.77.1.tar.bz2
|
||||
/docbook-xsl-doc-1.78.0.tar.bz2
|
||||
/docbook-xsl-1.78.0.tar.bz2
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: docbook-style-xsl
|
||||
Version: 1.77.1
|
||||
Release: 2%{?dist}
|
||||
Version: 1.78.0
|
||||
Release: 1%{?dist}
|
||||
Group: Applications/Text
|
||||
|
||||
Summary: Norman Walsh's XSL stylesheets for DocBook XML
|
||||
@ -126,6 +126,9 @@ if [ "$1" = 0 ]; then
|
||||
fi
|
||||
|
||||
%changelog
|
||||
* Thu Dec 20 2012 Ondrej Vasik <ovasik@redhat.com> 1.78.0-1
|
||||
- new upstream release 1.78.0
|
||||
|
||||
* Tue Jun 5 2012 Ondrej Vasik <ovasik@redhat.com> 1.77.1-2
|
||||
- ship VERSION.xsl file (#829014)
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl
|
||||
--- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-06-01 23:36:39.000000000 +0200
|
||||
+++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200
|
||||
@@ -324,7 +324,7 @@
|
||||
diff -urNp docbook-xsl-1.78.0-orig/fo/lists.xsl docbook-xsl-1.78.0/fo/lists.xsl
|
||||
--- docbook-xsl-1.78.0-orig/fo/lists.xsl 2012-12-20 11:45:07.870679175 +0100
|
||||
+++ docbook-xsl-1.78.0/fo/lists.xsl 2012-12-20 11:55:31.440307881 +0100
|
||||
@@ -376,7 +376,7 @@
|
||||
</xsl:when>
|
||||
<xsl:when test="@termlength">
|
||||
<xsl:variable name="termlength.is.number">
|
||||
@ -10,56 +10,30 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl
|
||||
</xsl:variable>
|
||||
<xsl:choose>
|
||||
<xsl:when test="string($termlength.is.number) = 'NaN'">
|
||||
@@ -333,15 +333,7 @@
|
||||
@@ -385,7 +385,7 @@
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="@termlength"/>
|
||||
- <xsl:choose>
|
||||
- <!-- workaround for passivetex lack of support for non-constant expressions -->
|
||||
- <xsl:when test="$passivetex.extensions != 0">
|
||||
- <xsl:text>em</xsl:text>
|
||||
- </xsl:when>
|
||||
- <xsl:otherwise>
|
||||
- <xsl:text>em * 0.60</xsl:text>
|
||||
- </xsl:otherwise>
|
||||
- </xsl:choose>
|
||||
- <xsl:text>em * 0.60</xsl:text>
|
||||
+ <xsl:text>em</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:when>
|
||||
@@ -350,15 +342,7 @@
|
||||
@@ -394,7 +394,7 @@
|
||||
<xsl:with-param name="terms" select="varlistentry/term"/>
|
||||
<xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
|
||||
</xsl:call-template>
|
||||
- <xsl:choose>
|
||||
- <!-- workaround for passivetex lack of support for non-constant expressions -->
|
||||
- <xsl:when test="$passivetex.extensions != 0">
|
||||
- <xsl:text>em</xsl:text>
|
||||
- </xsl:when>
|
||||
- <xsl:otherwise>
|
||||
- <xsl:text>em * 0.60</xsl:text>
|
||||
- </xsl:otherwise>
|
||||
- </xsl:choose>
|
||||
- <xsl:text>em * 0.60</xsl:text>
|
||||
+ <xsl:text>em</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
@@ -372,17 +356,7 @@
|
||||
|
||||
@@ -409,8 +409,6 @@
|
||||
<xsl:variable name="label-separation">1em</xsl:variable>
|
||||
<xsl:variable name="distance-between-starts">
|
||||
- <xsl:choose>
|
||||
- <!-- workaround for passivetex lack of support for non-constant expressions -->
|
||||
- <xsl:when test="$passivetex.extensions != 0">
|
||||
- <xsl:value-of select="$termlength"/>
|
||||
- </xsl:when>
|
||||
- <xsl:otherwise>
|
||||
- <xsl:value-of select="$termlength"/>
|
||||
- <xsl:text>+</xsl:text>
|
||||
- <xsl:value-of select="$label-separation"/>
|
||||
- </xsl:otherwise>
|
||||
- </xsl:choose>
|
||||
+ <xsl:value-of select="$termlength"/>
|
||||
<xsl:value-of select="$termlength"/>
|
||||
- <xsl:text>+</xsl:text>
|
||||
- <xsl:value-of select="$label-separation"/>
|
||||
</xsl:variable>
|
||||
|
||||
<xsl:if test="title">
|
||||
|
Loading…
Reference in New Issue
Block a user