New upstream release 1.75.0, update marginleft patch

This commit is contained in:
Ondrej Vasik 2009-05-11 09:46:36 +00:00
parent adfbb1ffa6
commit e80086cbd6
4 changed files with 27 additions and 37 deletions

View File

@ -1,2 +1,2 @@
docbook-xsl-1.74.3.tar.bz2 docbook-xsl-1.75.0.tar.bz2
docbook-xsl-doc-1.74.3.tar.bz2 docbook-xsl-doc-1.75.0.tar.bz2

View File

@ -1,5 +1,5 @@
Name: docbook-style-xsl Name: docbook-style-xsl
Version: 1.74.3 Version: 1.75.0
Release: 1%{?dist} Release: 1%{?dist}
Group: Applications/Text Group: Applications/Text
@ -117,6 +117,10 @@ if [ "$1" = 0 ]; then
fi fi
%changelog %changelog
* Mon May 11 2009 Ondrej Vasik <ovasik@redhat.com> 1.75.0-1
- New upstream release 1.75.0
- update marginleft patch
* Wed Mar 11 2009 Ondrej Vasik <ovasik@redhat.com> 1.74.3-1 * Wed Mar 11 2009 Ondrej Vasik <ovasik@redhat.com> 1.74.3-1
- New upstream release 1.74.3 - New upstream release 1.74.3

View File

@ -63,24 +63,24 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl
</xsl:variable> </xsl:variable>
<xsl:if test="title"> <xsl:if test="title">
diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl
--- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200 --- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200
+++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:32:46.000000000 +0200 +++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200
@@ -34,29 +34,11 @@ @@ -133,8 +133,8 @@
margin-left="{$page.margin.outer} - {$title.margin.left}" <xsl:attribute-set name="component.title.properties">
--> <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
<xsl:param name="margin.left.outer"> <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
- <xsl:choose> - <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
- <xsl:when test="$passivetex.extensions != 0"> - <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
- <xsl:value-of select="$page.margin.outer"/> + <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
- </xsl:when> + <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
- <xsl:otherwise> <xsl:attribute name="hyphenate">false</xsl:attribute>
- <xsl:value-of select="$page.margin.outer"/> <xsl:attribute name="text-align">
- <xsl:text> - </xsl:text> <xsl:choose>
- <xsl:value-of select="$title.margin.left"/> diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pagesetup.xsl
- </xsl:otherwise> --- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl 2009-05-11 11:40:49.000000000 +0200
- </xsl:choose> +++ docbook-xsl-1.75.0/fo/pagesetup.xsl 2009-05-11 11:42:29.000000000 +0200
+ <xsl:value-of select="$page.margin.outer"/> @@ -30,16 +30,7 @@
</xsl:param> </xsl:param>
<xsl:param name="margin.left.inner"> <xsl:param name="margin.left.inner">
@ -98,17 +98,3 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
</xsl:param> </xsl:param>
<xsl:template name="setup.pagemasters"> <xsl:template name="setup.pagemasters">
diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl
--- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200
+++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200
@@ -133,8 +133,8 @@
<xsl:attribute-set name="component.title.properties">
<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
<xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
+ <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
+ <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
<xsl:attribute name="hyphenate">false</xsl:attribute>
<xsl:attribute name="text-align">
<xsl:choose>

View File

@ -1,2 +1,2 @@
c77c0c317040b2f2e366842bd9df2218 docbook-xsl-1.74.3.tar.bz2 70b32995e9dfa9b636f6b73babcd3187 docbook-xsl-1.75.0.tar.bz2
2a032a95fbf24367d13acc8210f9cd72 docbook-xsl-doc-1.74.3.tar.bz2 979096e1b04ac0a22f5f9dd2ed0d8e40 docbook-xsl-doc-1.75.0.tar.bz2