rpms/docbook-style-xsl
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rediffed all patches to work with patch --fuzz=0

Browse Source
This commit is contained in:
Kamil Dudka 2008-08-06 11:56:12 +00:00
parent adbe46b402
commit f011aa50a2
6 changed files with 114 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docbook-style-xsl.spec
View File

@ -1,6 +1,6 @@
Name: docbook-style-xsl
Version: 1.74.0
Release: 2%{?dist}
Release: 3%{?dist}
Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML
@ -117,6 +117,9 @@ if [ "$1" = 0 ]; then
fi
%changelog
* Wed Aug 06 2008 Kamil Dudka <kdudka@redhat.com> 1.74.0-3
- Rediffed all patches to work with patch --fuzz=0
* Wed Aug 06 2008 Kamil Dudka <kdudka@redhat.com> 1.74.0-2
- Tiny changes in docbook-xsl-newmethods.patch to work with xalan
(#452867)

6
docbook-xsl-list-item-body.patch
View File

@ -1,6 +1,6 @@
diff -urNp 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-03 13:04:57.000000000 +0200
+++ docbook-xsl-1.74.0/fo/lists.xsl 2008-06-03 13:09:54.000000000 +0200
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-08-06 13:32:46.000000000 +0200
+++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:41:27.000000000 +0200
@@ -248,9 +248,17 @@
</fo:block>
</fo:list-item-label>

145
docbook-xsl-marginleft.patch
View File

@ -1,5 +1,71 @@
--- docbook-xsl-1.68.0/fo/pagesetup.xsl.marginleft 2005-02-09 12:09:37.000000000 +0000
+++ docbook-xsl-1.68.0/fo/pagesetup.xsl 2005-02-09 14:53:59.088068221 +0000
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 @@
</xsl:when>
<xsl:when test="@termlength">
<xsl:variable name="termlength.is.number">
- <xsl:value-of select="@termlength + 0"/>
+ <xsl:value-of select="@termlength"/>
</xsl:variable>
<xsl:choose>
<xsl:when test="string($termlength.is.number) = 'NaN'">
@@ -333,15 +333,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</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -350,15 +342,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</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
@@ -372,17 +356,7 @@
<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:variable>
<xsl:if test="title">
diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl
--- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200
+++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:32:46.000000000 +0200
@@ -34,29 +34,11 @@
margin-left="{$page.margin.outer} - {$title.margin.left}"
-->
@ -32,73 +98,10 @@
</xsl:param>
<xsl:template name="setup.pagemasters">
--- docbook-xsl-1.68.0/fo/lists.xsl.marginleft 2005-02-09 12:09:37.000000000 +0000
+++ docbook-xsl-1.68.0/fo/lists.xsl 2005-02-09 14:55:06.682138599 +0000
@@ -371,7 +371,7 @@
</xsl:when>
<xsl:when test="@termlength">
<xsl:variable name="termlength.is.number">
- <xsl:value-of select="@termlength + 0"/>
+ <xsl:value-of select="@termlength"/>
</xsl:variable>
<xsl:choose>
<xsl:when test="$termlength.is.number = 'NaN'">
@@ -380,15 +380,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</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -397,15 +389,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</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
@@ -419,17 +403,7 @@
<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:variable>
<xsl:if test="title">
--- docbook-xsl-1.68.0/fo/param.xsl.marginleft 2005-02-09 12:20:55.000000000 +0000
+++ docbook-xsl-1.68.0/fo/param.xsl 2005-02-09 14:53:59.115063057 +0000
@@ -95,8 +95,8 @@
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>
@ -107,5 +110,5 @@
+ <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>
<xsl:attribute name="text-align">
<xsl:choose>

43
docbook-xsl-newmethods.patch
View File

@ -1,15 +1,15 @@
diff -urNp docbook-xsl-1.72.0/html/docbook.xsl devel/html/docbook.xsl
--- docbook-xsl-1.72.0/html/docbook.xsl 2007-01-21 18:39:03.000000000 +0100
+++ devel/html/docbook.xsl 2007-06-18 13:19:45.000000000 +0200
@@ -25,6 +25,7 @@
diff -ruNp docbook-xsl-1.74.0.orig/html/docbook.xsl docbook-xsl-1.74.0/html/docbook.xsl
--- docbook-xsl-1.74.0.orig/html/docbook.xsl 2008-06-01 23:36:39.000000000 +0200
+++ docbook-xsl-1.74.0/html/docbook.xsl 2008-08-06 13:37:35.000000000 +0200
@@ -26,6 +26,7 @@
<xsl:include href="../VERSION"/>
<xsl:include href="param.xsl"/>
<xsl:include href="../lib/lib.xsl"/>
+<xsl:include href="../lib/dumpfragment.xsl"/>
<xsl:include href="../common/l10n.xsl"/>
<xsl:include href="../common/common.xsl"/>
<xsl:include href="../common/labels.xsl"/>
@@ -42,6 +43,7 @@
<xsl:include href="../common/utility.xsl"/>
@@ -44,6 +45,7 @@
<xsl:include href="graphics.xsl"/>
<xsl:include href="xref.xsl"/>
<xsl:include href="formal.xsl"/>
@ -17,9 +17,9 @@ diff -urNp docbook-xsl-1.72.0/html/docbook.xsl devel/html/docbook.xsl
<xsl:include href="table.xsl"/>
<xsl:include href="htmltbl.xsl"/>
<xsl:include href="sections.xsl"/>
diff -urNp docbook-xsl-1.72.0/html/dtbl.xsl devel/html/dtbl.xsl
--- docbook-xsl-1.72.0/html/dtbl.xsl 1970-01-01 01:00:00.000000000 +0100
+++ devel/html/dtbl.xsl 2007-06-18 14:00:05.000000000 +0200
diff -ruNp docbook-xsl-1.74.0.orig/html/dtbl.xsl docbook-xsl-1.74.0/html/dtbl.xsl
--- docbook-xsl-1.74.0.orig/html/dtbl.xsl 1970-01-01 01:00:00.000000000 +0100
+++ docbook-xsl-1.74.0/html/dtbl.xsl 2008-08-06 13:37:35.000000000 +0200
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@ -314,11 +314,10 @@ diff -urNp docbook-xsl-1.72.0/html/dtbl.xsl devel/html/dtbl.xsl
+</xsl:template>
+
+</xsl:stylesheet>
diff -urNp docbook-xsl-1.72.0/html/param.xsl devel/html/param.xsl
--- docbook-xsl-1.72.0/html/param.xsl 2007-01-23 13:33:37.000000000 +0100
+++ devel/html/param.xsl 2007-06-18 13:26:41.000000000 +0200
diff -ruNp docbook-xsl-1.74.0.orig/html/param.xsl docbook-xsl-1.74.0/html/param.xsl
--- docbook-xsl-1.74.0.orig/html/param.xsl 2008-06-02 01:06:16.000000000 +0200
+++ docbook-xsl-1.74.0/html/param.xsl 2008-08-06 13:37:35.000000000 +0200
@@ -64,6 +64,7 @@ div.annotation-close { position: absolut
right: 2px;
}
</xsl:param>
@ -326,11 +325,9 @@ diff -urNp docbook-xsl-1.72.0/html/param.xsl devel/html/param.xsl
<xsl:param name="annotation.js">
<xsl:text>http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js</xsl:text></xsl:param>
<xsl:param name="annotation.graphic.open">http://docbook.sourceforge.net/release/images/annot-open.png</xsl:param>
<xsl:param name="annotation.graphic.close">
diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl
--- docbook-xsl-1.72.0/html/table.xsl 2006-12-06 10:28:33.000000000 +0100
+++ devel/html/table.xsl 2007-06-18 13:30:00.000000000 +0200
diff -ruNp docbook-xsl-1.74.0.orig/html/table.xsl docbook-xsl-1.74.0/html/table.xsl
--- docbook-xsl-1.74.0.orig/html/table.xsl 2008-06-01 23:36:39.000000000 +0200
+++ docbook-xsl-1.74.0/html/table.xsl 2008-08-06 13:37:35.000000000 +0200
@@ -5,7 +5,8 @@
xmlns:xtbl="xalan://com.nwalsh.xalan.Table"
xmlns:lxslt="http://xml.apache.org/xslt"
@ -341,7 +338,7 @@ diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl
version='1.0'>
<xsl:include href="../common/table.xsl"/>
@@ -373,6 +374,9 @@
@@ -365,6 +366,9 @@
<xsl:when test="$use.extensions != 0
and $tablecolumns.extension != 0">
<xsl:choose>
@ -351,7 +348,7 @@ diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl
<xsl:when test="function-available('stbl:convertLength')">
<xsl:value-of select="stbl:convertLength($table.width)"/>
</xsl:when>
@@ -397,6 +401,9 @@
@@ -389,6 +393,9 @@
<xsl:when test="$use.extensions != 0
and $tablecolumns.extension != 0">
<xsl:choose>
@ -361,9 +358,9 @@ diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl
<xsl:when test="function-available('stbl:adjustColumnWidths')">
<xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/>
</xsl:when>
diff -urNp docbook-xsl-1.72.0/lib/dumpfragment.xsl devel/lib/dumpfragment.xsl
--- docbook-xsl-1.72.0/lib/dumpfragment.xsl 1970-01-01 01:00:00.000000000 +0100
+++ devel/lib/dumpfragment.xsl 2007-06-18 14:00:52.000000000 +0200
diff -ruNp docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl docbook-xsl-1.74.0/lib/dumpfragment.xsl
--- docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl 1970-01-01 01:00:00.000000000 +0100
+++ docbook-xsl-1.74.0/lib/dumpfragment.xsl 2008-08-06 13:37:35.000000000 +0200
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<xsl:stylesheet version="1.0"

8
docbook-xsl-non-constant-expressions.patch
View File

@ -1,6 +1,6 @@
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
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-08-06 13:32:46.000000000 +0200
+++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:38:36.000000000 +0200
@@ -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>
@ -12,7 +12,7 @@ diff -ur docbook-xsl-1.73.2-orig/fo/param.xsl docbook-xsl-1.73.2/fo/param.xsl
<xsl:attribute name="hyphenate">false</xsl:attribute>
<xsl:attribute name="text-align">center</xsl:attribute>
</xsl:attribute-set>
@@ -331,8 +331,8 @@
@@ -334,8 +334,8 @@ set toc,title
<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>

11
docbook-xsl-pagesetup.patch
View File

@ -1,7 +1,7 @@
diff -urp docbook-xsl-1.73.2-orig/fo/pagesetup.xsl docbook-xsl-1.73.2/fo/pagesetup.xsl
--- docbook-xsl-1.73.2-orig/fo/pagesetup.xsl 2007-12-03 14:54:28.000000000 +0100
+++ docbook-xsl-1.73.2/fo/pagesetup.xsl 2007-12-03 15:24:32.000000000 +0100
@@ -1679,37 +1679,82 @@
diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl
--- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-06-01 23:36:39.000000000 +0200
+++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200
@@ -1697,36 +1697,81 @@
<xsl:with-param name="gentext-key" select="$gentext-key"/>
</xsl:call-template>
@ -113,8 +113,7 @@ diff -urp docbook-xsl-1.73.2-orig/fo/pagesetup.xsl docbook-xsl-1.73.2/fo/pageset
<fo:table-body>
<fo:table-row>
<xsl:attribute name="block-progression-dimension.minimum">
@@ -2003,36 +2046,81 @@
@@ -2021,36 +2066,81 @@
<xsl:with-param name="sequence" select="$sequence"/>
<xsl:with-param name="gentext-key" select="$gentext-key"/>
</xsl:call-template>