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

use changes from pagesetup.xsl patch only for passivetex.extensions set to

Browse Source 
1
This commit is contained in:
Ondrej Vasik 2007-12-03 15:36:43 +00:00
parent 2bc3e3ee6d
commit eb2f94a355
2 changed files with 225 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docbook-style-xsl.spec
View File

@ -1,6 +1,6 @@
Name: docbook-style-xsl Name: docbook-style-xsl
Version: 1.73.2 Version: 1.73.2
Release: 5%{?dist} Release: 6%{?dist}
Group: Applications/Text Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML Summary: Norman Walsh's XSL stylesheets for DocBook XML
@ -110,6 +110,10 @@ CATALOG=%{_sysconfdir}/xml/catalog
%changelog %changelog
* 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)
* Tue Nov 27 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-5 * Tue Nov 27 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-5
- convert all html files in doc to UTF-8 in prep - convert all html files in doc to UTF-8 in prep
(latest rpmlint gives warnings) (latest rpmlint gives warnings)

266
docbook-xsl-pagesetup.patch
View File

@ -1,74 +1,228 @@
--- docbook-xsl-1.69.1/fo/pagesetup.xsl.orig 2005-12-10 14:08:28.000000000 -0600 diff -urp docbook-xsl-1.73.2-orig/fo/pagesetup.xsl docbook-xsl-1.73.2/fo/pagesetup.xsl
+++ docbook-xsl-1.69.1/fo/pagesetup.xsl 2006-01-01 19:49:28.000000000 -0600 --- docbook-xsl-1.73.2-orig/fo/pagesetup.xsl 2007-12-03 14:54:28.000000000 +0100
@@ -1491,32 +1491,29 @@ +++ docbook-xsl-1.73.2/fo/pagesetup.xsl 2007-12-03 15:24:32.000000000 +0100
@@ -1679,37 +1679,82 @@
<xsl:with-param name="gentext-key" select="$gentext-key"/>
</xsl:call-template>
<fo:table-column column-number="1"> - <fo:table-column column-number="1">
<xsl:attribute name="column-width"> - <xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text> - <xsl:text>proportional-column-width(</xsl:text>
<xsl:call-template name="header.footer.width"> - <xsl:call-template name="header.footer.width">
<xsl:with-param name="location">header</xsl:with-param> - <xsl:with-param name="location">header</xsl:with-param>
<xsl:with-param name="position" select="$column1"/> - <xsl:with-param name="position" select="$column1"/>
</xsl:call-template> - </xsl:call-template>
- <xsl:text>)</xsl:text> - <xsl:text>)</xsl:text>
+ <xsl:text>%</xsl:text> - </xsl:attribute>
</xsl:attribute> - </fo:table-column>
</fo:table-column> - <fo:table-column column-number="2">
<fo:table-column column-number="2"> - <xsl:attribute name="column-width">
<xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text> - <xsl:text>proportional-column-width(</xsl:text>
<xsl:call-template name="header.footer.width"> - <xsl:call-template name="header.footer.width">
<xsl:with-param name="location">header</xsl:with-param> - <xsl:with-param name="location">header</xsl:with-param>
<xsl:with-param name="position" select="2"/> - <xsl:with-param name="position" select="2"/>
</xsl:call-template> - </xsl:call-template>
- <xsl:text>)</xsl:text> - <xsl:text>)</xsl:text>
+ <xsl:text>%</xsl:text> - </xsl:attribute>
</xsl:attribute> - </fo:table-column>
</fo:table-column> - <fo:table-column column-number="3">
<fo:table-column column-number="3"> - <xsl:attribute name="column-width">
<xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text> - <xsl:text>proportional-column-width(</xsl:text>
<xsl:call-template name="header.footer.width"> - <xsl:call-template name="header.footer.width">
<xsl:with-param name="location">header</xsl:with-param> - <xsl:with-param name="location">header</xsl:with-param>
<xsl:with-param name="position" select="$column3"/> - <xsl:with-param name="position" select="$column3"/>
</xsl:call-template> - </xsl:call-template>
- <xsl:text>)</xsl:text> - <xsl:text>)</xsl:text>
- </xsl:attribute>
- </fo:table-column>
+ <xsl:choose>
+ <xsl:when test="$passivetex.extensions != 0">
+ <fo:table-column column-number="1">
+ <xsl:attribute name="column-width">
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">header</xsl:with-param>
+ <xsl:with-param name="position" select="$column1"/>
+ </xsl:call-template>
+ <xsl:text>%</xsl:text> + <xsl:text>%</xsl:text>
</xsl:attribute> + </xsl:attribute>
</fo:table-column> + </fo:table-column>
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:table-column column-number="1">
+ <xsl:attribute name="column-width">
+ <xsl:text>proportional-column-width(</xsl:text>
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">header</xsl:with-param>
+ <xsl:with-param name="position" select="$column1"/>
+ </xsl:call-template>
+ <xsl:text>)</xsl:text>
+ </xsl:attribute>
+ </fo:table-column>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="$passivetex.extensions != 0">
+ <fo:table-column column-number="2">
+ <xsl:attribute name="column-width">
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">header</xsl:with-param>
+ <xsl:with-param name="position" select="2"/>
+ </xsl:call-template>
+ <xsl:text>%</xsl:text>
+ </xsl:attribute>
+ </fo:table-column>
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:table-column column-number="2">
+ <xsl:attribute name="column-width">
+ <xsl:text>proportional-column-width(</xsl:text>
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">header</xsl:with-param>
+ <xsl:with-param name="position" select="2"/>
+ </xsl:call-template>
+ <xsl:text>)</xsl:text>
+ </xsl:attribute>
+ </fo:table-column>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="$passivetex.extensions != 0">
+ <fo:table-column column-number="3">
+ <xsl:attribute name="column-width">
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">header</xsl:with-param>
+ <xsl:with-param name="position" select="$column3"/>
+ </xsl:call-template>
+ <xsl:text>%</xsl:text>
+ </xsl:attribute>
+ </fo:table-column>
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:table-column column-number="3">
+ <xsl:attribute name="column-width">
+ <xsl:text>proportional-column-width(</xsl:text>
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">header</xsl:with-param>
+ <xsl:with-param name="position" select="$column3"/>
+ </xsl:call-template>
+ <xsl:text>)</xsl:text>
+ </xsl:attribute>
+ </fo:table-column>
+ </xsl:otherwise>
+ </xsl:choose>
@@ -1812,32 +1809,29 @@ <fo:table-body>
<fo:table-row>
<xsl:attribute name="block-progression-dimension.minimum">
@@ -2003,36 +2046,81 @@
<xsl:with-param name="sequence" select="$sequence"/>
<xsl:with-param name="gentext-key" select="$gentext-key"/>
</xsl:call-template> </xsl:call-template>
<fo:table-column column-number="1"> - <fo:table-column column-number="1">
<xsl:attribute name="column-width"> - <xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text> - <xsl:text>proportional-column-width(</xsl:text>
<xsl:call-template name="header.footer.width"> - <xsl:call-template name="header.footer.width">
<xsl:with-param name="location">footer</xsl:with-param> - <xsl:with-param name="location">footer</xsl:with-param>
<xsl:with-param name="position" select="$column1"/> - <xsl:with-param name="position" select="$column1"/>
</xsl:call-template> - </xsl:call-template>
- <xsl:text>)</xsl:text> - <xsl:text>)</xsl:text>
+ <xsl:text>%</xsl:text> - </xsl:attribute>
</xsl:attribute> - </fo:table-column>
</fo:table-column> - <fo:table-column column-number="2">
<fo:table-column column-number="2"> - <xsl:attribute name="column-width">
<xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text> - <xsl:text>proportional-column-width(</xsl:text>
<xsl:call-template name="header.footer.width"> - <xsl:call-template name="header.footer.width">
<xsl:with-param name="location">footer</xsl:with-param> - <xsl:with-param name="location">footer</xsl:with-param>
<xsl:with-param name="position" select="2"/> - <xsl:with-param name="position" select="2"/>
</xsl:call-template> - </xsl:call-template>
- <xsl:text>)</xsl:text> - <xsl:text>)</xsl:text>
+ <xsl:text>%</xsl:text> - </xsl:attribute>
</xsl:attribute> - </fo:table-column>
</fo:table-column> - <fo:table-column column-number="3">
<fo:table-column column-number="3"> - <xsl:attribute name="column-width">
<xsl:attribute name="column-width">
- <xsl:text>proportional-column-width(</xsl:text> - <xsl:text>proportional-column-width(</xsl:text>
<xsl:call-template name="header.footer.width"> - <xsl:call-template name="header.footer.width">
<xsl:with-param name="location">footer</xsl:with-param> - <xsl:with-param name="location">footer</xsl:with-param>
<xsl:with-param name="position" select="$column3"/> - <xsl:with-param name="position" select="$column3"/>
</xsl:call-template> - </xsl:call-template>
- <xsl:text>)</xsl:text> - <xsl:text>)</xsl:text>
- </xsl:attribute>
- </fo:table-column>
+ <xsl:choose>
+ <xsl:when test="$passivetex.extensions != 0">
+ <fo:table-column column-number="1">
+ <xsl:attribute name="column-width">
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">footer</xsl:with-param>
+ <xsl:with-param name="position" select="$column1"/>
+ </xsl:call-template>
+ <xsl:text>%</xsl:text> + <xsl:text>%</xsl:text>
</xsl:attribute> + </xsl:attribute>
</fo:table-column> + </fo:table-column>
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:table-column column-number="1">
+ <xsl:attribute name="column-width">
+ <xsl:text>proportional-column-width(</xsl:text>
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">footer</xsl:with-param>
+ <xsl:with-param name="position" select="$column1"/>
+ </xsl:call-template>
+ <xsl:text>)</xsl:text>
+ </xsl:attribute>
+ </fo:table-column>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="$passivetex.extensions != 0">
+ <fo:table-column column-number="2">
+ <xsl:attribute name="column-width">
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">footer</xsl:with-param>
+ <xsl:with-param name="position" select="2"/>
+ </xsl:call-template>
+ <xsl:text>%</xsl:text>
+ </xsl:attribute>
+ </fo:table-column>
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:table-column column-number="2">
+ <xsl:attribute name="column-width">
+ <xsl:text>proportional-column-width(</xsl:text>
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">footer</xsl:with-param>
+ <xsl:with-param name="position" select="2"/>
+ </xsl:call-template>
+ <xsl:text>)</xsl:text>
+ </xsl:attribute>
+ </fo:table-column>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="$passivetex.extensions != 0">
+ <fo:table-column column-number="3">
+ <xsl:attribute name="column-width">
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">footer</xsl:with-param>
+ <xsl:with-param name="position" select="$column3"/>
+ </xsl:call-template>
+ <xsl:text>%</xsl:text>
+ </xsl:attribute>
+ </fo:table-column>
+ </xsl:when>
+ <xsl:otherwise>
+ <fo:table-column column-number="3">
+ <xsl:attribute name="column-width">
+ <xsl:text>proportional-column-width(</xsl:text>
+ <xsl:call-template name="header.footer.width">
+ <xsl:with-param name="location">footer</xsl:with-param>
+ <xsl:with-param name="position" select="$column3"/>
+ </xsl:call-template>
+ <xsl:text>)</xsl:text>
+ </xsl:attribute>
+ </fo:table-column>
+ </xsl:otherwise>
+ </xsl:choose>
<fo:table-body>
<fo:table-row>