[docbook-style-xsl: 1/2] new stable upstream release 1.77.1, defuzz patches
Ondrej Vasik
ovasik at fedoraproject.org
Tue Jun 5 05:37:17 UTC 2012
commit f8d850bbfcd2cc2e52ee1e16092d283696c8557b
Author: Ondřej Vašík <ovasik at redhat.com>
Date: Tue Jun 5 07:35:42 2012 +0200
new stable upstream release 1.77.1, defuzz patches
.gitignore | 2 +
docbook-style-xsl.spec | 8 ++++-
docbook-xsl-marginleft.patch | 21 ---------------
docbook-xsl-pagesetup.patch | 58 ++++++++++++++++++++++++++++++++++++++++-
sources | 4 +-
5 files changed, 66 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a6c729..01bf97b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ docbook-xsl-doc-1.75.2.tar.bz2
/docbook-xsl-doc-1.76.0.tar.bz2
/docbook-xsl-1.76.1.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
diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec
index 9c0d315..edff93d 100644
--- a/docbook-style-xsl.spec
+++ b/docbook-style-xsl.spec
@@ -1,6 +1,6 @@
Name: docbook-style-xsl
-Version: 1.76.1
-Release: 4%{?dist}
+Version: 1.77.1
+Release: 1%{?dist}
Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -125,6 +125,10 @@ if [ "$1" = 0 ]; then
fi
%changelog
+* Tue Jun 5 2012 Ondrej Vasik <ovasik at redhat.com> 1.77.1-1
+- new stable upstream release 1.77.1
+- defuzz patches
+
* Tue Sep 6 2011 Ondrej Vasik <ovasik at redhat.com> 1.76.1-4
- revert previous change, workaround the mandir links issue
in buildroot (#727251)
diff --git a/docbook-xsl-marginleft.patch b/docbook-xsl-marginleft.patch
index 31c1b84..c5a8c8b 100644
--- a/docbook-xsl-marginleft.patch
+++ b/docbook-xsl-marginleft.patch
@@ -77,24 +77,3 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl
<xsl:attribute name="hyphenate">false</xsl:attribute>
<xsl:attribute name="text-align">
<xsl:choose>
-diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pagesetup.xsl
---- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl 2009-05-11 11:40:49.000000000 +0200
-+++ docbook-xsl-1.75.0/fo/pagesetup.xsl 2009-05-11 11:42:29.000000000 +0200
-@@ -30,16 +30,7 @@
- </xsl:param>
-
- <xsl:param name="margin.left.inner">
-- <xsl:choose>
-- <xsl:when test="$passivetex.extensions != 0">
-- <xsl:value-of select="$page.margin.inner"/>
-- </xsl:when>
-- <xsl:otherwise>
-- <xsl:value-of select="$page.margin.inner"/>
-- <xsl:text> - </xsl:text>
-- <xsl:value-of select="$title.margin.left"/>
-- </xsl:otherwise>
-- </xsl:choose>
-+ <xsl:value-of select="$page.margin.inner"/>
- </xsl:param>
-
- <xsl:template name="setup.pagemasters">
diff --git a/docbook-xsl-pagesetup.patch b/docbook-xsl-pagesetup.patch
index e4d77ff..2c9c62b 100644
--- a/docbook-xsl-pagesetup.patch
+++ b/docbook-xsl-pagesetup.patch
@@ -1,7 +1,7 @@
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 @@
+@@ -1697,45 +1697,99 @@
<xsl:with-param name="gentext-key" select="$gentext-key"/>
</xsl:call-template>
@@ -11,6 +11,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
- <xsl:call-template name="header.footer.width">
- <xsl:with-param name="location">header</xsl:with-param>
- <xsl:with-param name="position" select="$column1"/>
+- <xsl:with-param name="pageclass" select="$pageclass"/>
+- <xsl:with-param name="sequence" select="$sequence"/>
+- <xsl:with-param name="gentext-key" select="$gentext-key"/>
- </xsl:call-template>
- <xsl:text>)</xsl:text>
- </xsl:attribute>
@@ -21,6 +24,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
- <xsl:call-template name="header.footer.width">
- <xsl:with-param name="location">header</xsl:with-param>
- <xsl:with-param name="position" select="2"/>
+- <xsl:with-param name="pageclass" select="$pageclass"/>
+- <xsl:with-param name="sequence" select="$sequence"/>
+- <xsl:with-param name="gentext-key" select="$gentext-key"/>
- </xsl:call-template>
- <xsl:text>)</xsl:text>
- </xsl:attribute>
@@ -31,6 +37,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
- <xsl:call-template name="header.footer.width">
- <xsl:with-param name="location">header</xsl:with-param>
- <xsl:with-param name="position" select="$column3"/>
+- <xsl:with-param name="pageclass" select="$pageclass"/>
+- <xsl:with-param name="sequence" select="$sequence"/>
+- <xsl:with-param name="gentext-key" select="$gentext-key"/>
- </xsl:call-template>
- <xsl:text>)</xsl:text>
- </xsl:attribute>
@@ -42,6 +51,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">header</xsl:with-param>
+ <xsl:with-param name="position" select="$column1"/>
++ <xsl:with-param name="pageclass" select="$pageclass"/>
++ <xsl:with-param name="sequence" select="$sequence"/>
++ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+ <xsl:text>%</xsl:text>
+ </xsl:attribute>
@@ -54,6 +66,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">header</xsl:with-param>
+ <xsl:with-param name="position" select="$column1"/>
++ <xsl:with-param name="pageclass" select="$pageclass"/>
++ <xsl:with-param name="sequence" select="$sequence"/>
++ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+ <xsl:text>)</xsl:text>
+ </xsl:attribute>
@@ -67,6 +82,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">header</xsl:with-param>
+ <xsl:with-param name="position" select="2"/>
++ <xsl:with-param name="pageclass" select="$pageclass"/>
++ <xsl:with-param name="sequence" select="$sequence"/>
++ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+ <xsl:text>%</xsl:text>
+ </xsl:attribute>
@@ -79,6 +97,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">header</xsl:with-param>
+ <xsl:with-param name="position" select="2"/>
++ <xsl:with-param name="pageclass" select="$pageclass"/>
++ <xsl:with-param name="sequence" select="$sequence"/>
++ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+ <xsl:text>)</xsl:text>
+ </xsl:attribute>
@@ -92,6 +113,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">header</xsl:with-param>
+ <xsl:with-param name="position" select="$column3"/>
++ <xsl:with-param name="pageclass" select="$pageclass"/>
++ <xsl:with-param name="sequence" select="$sequence"/>
++ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+ <xsl:text>%</xsl:text>
+ </xsl:attribute>
@@ -104,6 +128,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">header</xsl:with-param>
+ <xsl:with-param name="position" select="$column3"/>
++ <xsl:with-param name="pageclass" select="$pageclass"/>
++ <xsl:with-param name="sequence" select="$sequence"/>
++ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+ <xsl:text>)</xsl:text>
+ </xsl:attribute>
@@ -113,7 +140,7 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
<fo:table-body>
<fo:table-row>
-@@ -2021,36 +2066,81 @@
+@@ -2021,45 +2066,99 @@
<xsl:with-param name="sequence" select="$sequence"/>
<xsl:with-param name="gentext-key" select="$gentext-key"/>
</xsl:call-template>
@@ -123,6 +150,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
- <xsl:call-template name="header.footer.width">
- <xsl:with-param name="location">footer</xsl:with-param>
- <xsl:with-param name="position" select="$column1"/>
+- <xsl:with-param name="pageclass" select="$pageclass"/>
+- <xsl:with-param name="sequence" select="$sequence"/>
+- <xsl:with-param name="gentext-key" select="$gentext-key"/>
- </xsl:call-template>
- <xsl:text>)</xsl:text>
- </xsl:attribute>
@@ -133,6 +163,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
- <xsl:call-template name="header.footer.width">
- <xsl:with-param name="location">footer</xsl:with-param>
- <xsl:with-param name="position" select="2"/>
+- <xsl:with-param name="pageclass" select="$pageclass"/>
+- <xsl:with-param name="sequence" select="$sequence"/>
+- <xsl:with-param name="gentext-key" select="$gentext-key"/>
- </xsl:call-template>
- <xsl:text>)</xsl:text>
- </xsl:attribute>
@@ -143,6 +176,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
- <xsl:call-template name="header.footer.width">
- <xsl:with-param name="location">footer</xsl:with-param>
- <xsl:with-param name="position" select="$column3"/>
+- <xsl:with-param name="pageclass" select="$pageclass"/>
+- <xsl:with-param name="sequence" select="$sequence"/>
+- <xsl:with-param name="gentext-key" select="$gentext-key"/>
- </xsl:call-template>
- <xsl:text>)</xsl:text>
- </xsl:attribute>
@@ -154,6 +190,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">footer</xsl:with-param>
+ <xsl:with-param name="position" select="$column1"/>
++ <xsl:with-param name="pageclass" select="$pageclass"/>
++ <xsl:with-param name="sequence" select="$sequence"/>
++ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+ <xsl:text>%</xsl:text>
+ </xsl:attribute>
@@ -166,6 +205,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">footer</xsl:with-param>
+ <xsl:with-param name="position" select="$column1"/>
++ <xsl:with-param name="pageclass" select="$pageclass"/>
++ <xsl:with-param name="sequence" select="$sequence"/>
++ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+ <xsl:text>)</xsl:text>
+ </xsl:attribute>
@@ -179,6 +221,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">footer</xsl:with-param>
+ <xsl:with-param name="position" select="2"/>
++ <xsl:with-param name="pageclass" select="$pageclass"/>
++ <xsl:with-param name="sequence" select="$sequence"/>
++ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+ <xsl:text>%</xsl:text>
+ </xsl:attribute>
@@ -191,6 +236,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">footer</xsl:with-param>
+ <xsl:with-param name="position" select="2"/>
++ <xsl:with-param name="pageclass" select="$pageclass"/>
++ <xsl:with-param name="sequence" select="$sequence"/>
++ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+ <xsl:text>)</xsl:text>
+ </xsl:attribute>
@@ -204,6 +252,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">footer</xsl:with-param>
+ <xsl:with-param name="position" select="$column3"/>
++ <xsl:with-param name="pageclass" select="$pageclass"/>
++ <xsl:with-param name="sequence" select="$sequence"/>
++ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+ <xsl:text>%</xsl:text>
+ </xsl:attribute>
@@ -216,6 +267,9 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagese
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">footer</xsl:with-param>
+ <xsl:with-param name="position" select="$column3"/>
++ <xsl:with-param name="pageclass" select="$pageclass"/>
++ <xsl:with-param name="sequence" select="$sequence"/>
++ <xsl:with-param name="gentext-key" select="$gentext-key"/>
+ </xsl:call-template>
+ <xsl:text>)</xsl:text>
+ </xsl:attribute>
diff --git a/sources b/sources
index 35b49b6..dfdb081 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b5340507cb240cc7ce00632b9c40bff5 docbook-xsl-1.76.1.tar.bz2
-200b1047cdbfb87cfc49b3f841513a21 docbook-xsl-doc-1.76.1.tar.bz2
+a88dbdc0cd74702656083b6e4e4241d8 docbook-xsl-1.77.1.tar.bz2
+070c32cc7dc3909fcc7c0fe35c2ff30a docbook-xsl-doc-1.77.1.tar.bz2
More information about the scm-commits
mailing list