diff --git a/.cvsignore b/.cvsignore index b018bc9..d0ae366 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ docbook-xsl-1.65.1.tar.gz docbook-xsl-1.66.1.tar.gz docbook-xsl-1.67.0.tar.gz docbook-xsl-1.67.2.tar.bz2 +docbook-xsl-1.68.0.tar.bz2 diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec index c495721..0f04f04 100644 --- a/docbook-style-xsl.spec +++ b/docbook-style-xsl.spec @@ -1,6 +1,6 @@ Name: docbook-style-xsl -Version: 1.67.2 -Release: 2 +Version: 1.68.0 +Release: 1 Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML. @@ -91,6 +91,9 @@ CATALOG=/etc/xml/catalog %changelog +* Wed Feb 9 2005 Tim Waugh 1.68.0-1 +- 1.68.0. + * Wed Dec 8 2004 Tim Waugh 1.67.2-2 - Prevent expressions in passivetex output from index.xsl (bug #142229). diff --git a/docbook-xsl-marginleft.patch b/docbook-xsl-marginleft.patch index e22a103..e7a5d83 100644 --- a/docbook-xsl-marginleft.patch +++ b/docbook-xsl-marginleft.patch @@ -1,5 +1,5 @@ ---- docbook-xsl-1.67.2/fo/pagesetup.xsl.marginleft 2004-09-02 05:13:53.000000000 +0100 -+++ docbook-xsl-1.67.2/fo/pagesetup.xsl 2004-12-02 22:59:01.796211246 +0000 +--- 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 @@ -34,29 +34,11 @@ margin-left="{$page.margin.outer} - {$title.margin.left}" --> @@ -32,9 +32,9 @@ ---- docbook-xsl-1.67.2/fo/lists.xsl.marginleft 2004-11-20 11:49:17.000000000 +0000 -+++ docbook-xsl-1.67.2/fo/lists.xsl 2004-12-02 23:02:08.361569542 +0000 -@@ -353,7 +353,7 @@ +--- 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 @@ @@ -43,49 +43,62 @@ -@@ -364,7 +364,7 @@ +@@ -380,15 +380,7 @@ + + - - -- -+ - em - - -@@ -381,7 +381,7 @@ +- +- +- +- em +- +- +- em * 0.60 +- +- ++ em + + + +@@ -397,15 +389,7 @@ + + - - -- -+ - em - - -@@ -403,7 +403,7 @@ +- +- +- +- em +- +- +- em * 0.60 +- +- ++ em + + + +@@ -419,17 +403,7 @@ + + 1em - - +- +- - -+ - - - ---- docbook-xsl-1.67.2/fo/index.xsl.marginleft 2004-12-08 12:34:12.310231417 +0000 -+++ docbook-xsl-1.67.2/fo/index.xsl 2004-12-08 12:34:32.443381818 +0000 -@@ -255,8 +255,8 @@ - font-weight="bold" - keep-with-next.within-column="always" - space-before.optimum="{$body.font.master}pt" -- space-before.minimum="{$body.font.master * 0.8}pt" -- space-before.maximum="{$body.font.master * 1.2}pt"> -+ space-before.minimum="{$body.font.master}pt" -+ space-before.maximum="{$body.font.master}pt"> - - - ---- docbook-xsl-1.67.2/fo/param.xsl.marginleft 2004-12-08 12:40:18.526434259 +0000 -+++ docbook-xsl-1.67.2/fo/param.xsl 2004-12-08 12:40:32.104826321 +0000 -@@ -85,8 +85,8 @@ +- +- +- +- +- + +- +- +- ++ + + + +--- 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 @@ always @@ -94,12 +107,5 @@ + + false + 0pt - -@@ -685,4 +685,4 @@ - - - -- -\ No newline at end of file -+ diff --git a/sources b/sources index 2ab34ef..046f470 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -deb1864e3e190465dcc26145d2667a84 docbook-xsl-1.67.2.tar.bz2 +3cf72fd69e7e3bb7dd925363a0558bf2 docbook-xsl-1.68.0.tar.bz2