change a few non-constant expressions to constant - needed for

passivetex(#366441)
This commit is contained in:
Ondrej Vasik 2007-12-04 15:07:09 +00:00
parent eb2f94a355
commit 1d0b008972
3 changed files with 38 additions and 3 deletions

View File

@ -1,6 +1,6 @@
Name: docbook-style-xsl
Version: 1.73.2
Release: 6%{?dist}
Release: 7%{?dist}
Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML
@ -28,6 +28,7 @@ Source2: http://downloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.tar
Patch1: docbook-xsl-pagesetup.patch
Patch2: docbook-xsl-marginleft.patch
Patch3: docbook-xsl-newmethods.patch
Patch4: docbook-xsl-non-constant-expressions.patch
%description
@ -43,6 +44,7 @@ popd
%patch1 -p1 -b .pagesetup
%patch2 -p1 -b .marginleft
%patch3 -p1 -b .newmethods
%patch4 -p1 -b .nonconstant
cp -p %{SOURCE1} Makefile
# fix of non UTF-8 files rpmlint warnings
@ -110,6 +112,10 @@ CATALOG=%{_sysconfdir}/xml/catalog
%changelog
* Tue Dec 04 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-7
- change a few non-constant expressions to constant that
could now be handled by passivetex(#366441)
* Mon Dec 03 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-6
- fixed docbook-xsl-pagesetup.patch to follow Norman Walsh's
documentation for nonpassivetex processing(#307001)

View File

@ -104,8 +104,8 @@
<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, 'pt')"/></xsl:attribute>
+ <xsl:attribute name="space-before.maximum"><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*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="start-indent">0pt</xsl:attribute>
</xsl:attribute-set>

View File

@ -0,0 +1,29 @@
Pouze v docbook-xsl-1.73.2/fo: .index.xsl.swp
diff -ur docbook-xsl-1.73.2-orig/fo/param.xsl docbook-xsl-1.73.2/fo/param.xsl
--- docbook-xsl-1.73.2-orig/fo/param.xsl 2007-12-03 15:49:14.000000000 +0100
+++ docbook-xsl-1.73.2/fo/param.xsl 2007-12-04 15:49:46.000000000 +0100
@@ -23,8 +23,8 @@
<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
<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">center</xsl:attribute>
</xsl:attribute-set>
@@ -331,8 +331,8 @@
<xsl:attribute name="font-weight">bold</xsl:attribute>
<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="start-indent">0pt</xsl:attribute>
</xsl:attribute-set>
<xsl:attribute-set name="index.entry.properties">
Pouze v docbook-xsl-1.73.2/fo: .param.xsl.swp
Pouze v docbook-xsl-1.73.2/html: dtbl.xsl.newmethods
Pouze v docbook-xsl-1.73.2/lib: dumpfragment.xsl.newmethods