New upstream version 1.74.0 + adapted patch
This commit is contained in:
parent
828dcb63f6
commit
a6dee9c018
@ -1,3 +1,2 @@
|
||||
docbook-xsl-1.73.1.tar.gz
|
||||
docbook-xsl-1.73.2.tar.gz
|
||||
docbook-xsl-doc-1.73.2.tar.bz2
|
||||
docbook-xsl-1.74.0.tar.gz
|
||||
docbook-xsl-doc-1.74.0.tar.bz2
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: docbook-style-xsl
|
||||
Version: 1.73.2
|
||||
Release: 9%{?dist}
|
||||
Version: 1.74.0
|
||||
Release: 1%{?dist}
|
||||
Group: Applications/Text
|
||||
|
||||
Summary: Norman Walsh's XSL stylesheets for DocBook XML
|
||||
@ -117,6 +117,9 @@ if [ "$1" = 0 ]; then
|
||||
fi
|
||||
|
||||
%changelog
|
||||
* Tue Jun 03 2008 Ondrej Vasik <ovasik@redhat.com> 1.74.0-1
|
||||
- New upstream release 1.74.0, adapted patches
|
||||
|
||||
* Fri Dec 14 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-9
|
||||
- added fixes for passivetex extension and list-item-body
|
||||
(#161371)
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff -urNp docbook-xsl-1.73.2-orig/fo/lists.xsl docbook-xsl-1.73.2/fo/lists.xsl
|
||||
--- docbook-xsl-1.73.2-orig/fo/lists.xsl 2007-12-14 12:27:58.000000000 +0100
|
||||
+++ docbook-xsl-1.73.2/fo/lists.xsl 2007-12-14 12:43:25.000000000 +0100
|
||||
@@ -286,9 +286,17 @@
|
||||
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
|
||||
@@ -248,9 +248,17 @@
|
||||
</fo:block>
|
||||
</fo:list-item-label>
|
||||
<fo:list-item-body start-indent="body-start()">
|
||||
@ -22,34 +22,13 @@ diff -urNp docbook-xsl-1.73.2-orig/fo/lists.xsl docbook-xsl-1.73.2/fo/lists.xsl
|
||||
</fo:list-item-body>
|
||||
</xsl:variable>
|
||||
|
||||
@@ -484,9 +492,17 @@
|
||||
@@ -446,10 +454,18 @@
|
||||
</fo:block>
|
||||
</fo:list-item-label>
|
||||
<fo:list-item-body start-indent="body-start()">
|
||||
- <fo:block>
|
||||
- <xsl:apply-templates select="listitem"/>
|
||||
- </fo:block>
|
||||
+ <xsl:choose>
|
||||
+ <!-- * work around broken passivetex list-item-body rendering -->
|
||||
+ <xsl:when test="$passivetex.extensions = '1'">
|
||||
+ <xsl:apply-templates select="listitem"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:otherwise>
|
||||
+ <fo:block>
|
||||
+ <xsl:apply-templates select="listitem"/>
|
||||
+ </fo:block>
|
||||
+ </xsl:otherwise>
|
||||
+ </xsl:choose>
|
||||
</fo:list-item-body>
|
||||
</xsl:variable>
|
||||
|
||||
@@ -963,10 +979,18 @@
|
||||
</fo:block>
|
||||
</fo:list-item-label>
|
||||
<fo:list-item-body start-indent="body-start()">
|
||||
- <fo:block>
|
||||
- <xsl:apply-templates/>
|
||||
- </fo:block>
|
||||
- </fo:list-item-body>
|
||||
+ <xsl:choose>
|
||||
+ <!-- * work around broken passivetex list-item-body rendering -->
|
||||
@ -63,10 +42,10 @@ diff -urNp docbook-xsl-1.73.2-orig/fo/lists.xsl docbook-xsl-1.73.2/fo/lists.xsl
|
||||
+ </xsl:otherwise>
|
||||
+ </xsl:choose>
|
||||
+ </fo:list-item-body>
|
||||
</fo:list-item>
|
||||
</xsl:template>
|
||||
</xsl:variable>
|
||||
|
||||
@@ -989,9 +1013,17 @@
|
||||
<xsl:choose>
|
||||
@@ -925,9 +941,17 @@
|
||||
</fo:block>
|
||||
</fo:list-item-label>
|
||||
<fo:list-item-body start-indent="body-start()">
|
||||
@ -87,7 +66,28 @@ diff -urNp docbook-xsl-1.73.2-orig/fo/lists.xsl docbook-xsl-1.73.2/fo/lists.xsl
|
||||
</fo:list-item-body>
|
||||
</fo:list-item>
|
||||
</xsl:template>
|
||||
@@ -1168,9 +1200,17 @@
|
||||
@@ -951,9 +975,17 @@
|
||||
</fo:block>
|
||||
</fo:list-item-label>
|
||||
<fo:list-item-body start-indent="body-start()">
|
||||
- <fo:block>
|
||||
- <xsl:apply-templates/>
|
||||
- </fo:block>
|
||||
+ <xsl:choose>
|
||||
+ <!-- * work around broken passivetex list-item-body rendering -->
|
||||
+ <xsl:when test="$passivetex.extensions = '1'">
|
||||
+ <xsl:apply-templates/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:otherwise>
|
||||
+ <fo:block>
|
||||
+ <xsl:apply-templates/>
|
||||
+ </fo:block>
|
||||
+ </xsl:otherwise>
|
||||
+ </xsl:choose>
|
||||
</fo:list-item-body>
|
||||
</fo:list-item>
|
||||
</xsl:template>
|
||||
@@ -1141,9 +1173,17 @@
|
||||
</fo:block>
|
||||
</fo:list-item-label>
|
||||
<fo:list-item-body start-indent="body-start()">
|
||||
|
Loading…
Reference in New Issue
Block a user