commit
c8821fcc6a
@ -0,0 +1,2 @@
|
||||
e6d847ff26d46f5ab368e9dd76c95acf15c95a72 SOURCES/docbook-xsl-doc-1.79.2.tar.bz2
|
||||
fb4f60b3968777b5a794d1e1f9e5867b04517425 SOURCES/docbook-xsl-nons-1.79.2.tar.bz2
|
@ -0,0 +1,2 @@
|
||||
SOURCES/docbook-xsl-doc-1.79.2.tar.bz2
|
||||
SOURCES/docbook-xsl-nons-1.79.2.tar.bz2
|
@ -0,0 +1,74 @@
|
||||
diff -urN docbook-xsl-nons-1.79.2/fo/autoidx.xsl docbook-xsl-nons-1.79.2.new/fo/autoidx.xsl
|
||||
--- docbook-xsl-nons-1.79.2/fo/autoidx.xsl 2016-12-09 22:47:31.000000000 +0000
|
||||
+++ docbook-xsl-nons-1.79.2.new/fo/autoidx.xsl 2021-01-15 13:20:25.144862117 +0000
|
||||
@@ -295,7 +295,8 @@
|
||||
<fo:block>
|
||||
<xsl:if test="$autolink.index.see != 0">
|
||||
<xsl:attribute name="id">
|
||||
- <xsl:value-of select="concat('ientry-', generate-id())"/>
|
||||
+ <xsl:text>ientry-</xsl:text>
|
||||
+ <xsl:call-template name="object.id"/>
|
||||
</xsl:attribute>
|
||||
</xsl:if>
|
||||
<xsl:if test="$axf.extensions != 0">
|
||||
@@ -790,7 +791,10 @@
|
||||
|
||||
<xsl:variable name="linkend">
|
||||
<xsl:if test="$seetarget">
|
||||
- <xsl:value-of select="concat('ientry-', generate-id($seetarget))"/>
|
||||
+ <xsl:text>ientry-</xsl:text>
|
||||
+ <xsl:call-template name="object.id">
|
||||
+ <xsl:with-param name="object" select="$seetarget"/>
|
||||
+ </xsl:call-template>
|
||||
</xsl:if>
|
||||
</xsl:variable>
|
||||
|
||||
@@ -852,7 +856,10 @@
|
||||
|
||||
<xsl:variable name="linkend">
|
||||
<xsl:if test="$seealsotarget">
|
||||
- <xsl:value-of select="concat('ientry-', generate-id($seealsotarget))"/>
|
||||
+ <xsl:text>ientry-</xsl:text>
|
||||
+ <xsl:call-template name="object.id">
|
||||
+ <xsl:with-param name="object" select="$seealsotarget"/>
|
||||
+ </xsl:call-template>
|
||||
</xsl:if>
|
||||
</xsl:variable>
|
||||
|
||||
diff -urN docbook-xsl-nons-1.79.2/html/autoidx.xsl docbook-xsl-nons-1.79.2.new/html/autoidx.xsl
|
||||
--- docbook-xsl-nons-1.79.2/html/autoidx.xsl 2016-12-09 22:47:30.000000000 +0000
|
||||
+++ docbook-xsl-nons-1.79.2.new/html/autoidx.xsl 2021-01-15 13:20:25.145862128 +0000
|
||||
@@ -306,7 +306,8 @@
|
||||
<xsl:if test="$autolink.index.see != 0">
|
||||
<!-- add internal id attribute to form see and seealso links -->
|
||||
<xsl:attribute name="id">
|
||||
- <xsl:value-of select="concat('ientry-', generate-id())"/>
|
||||
+ <xsl:text>ientry-</xsl:text>
|
||||
+ <xsl:call-template name="object.id"/>
|
||||
</xsl:attribute>
|
||||
</xsl:if>
|
||||
<xsl:for-each select="$refs/primary">
|
||||
@@ -729,7 +730,10 @@
|
||||
|
||||
<xsl:variable name="linkend">
|
||||
<xsl:if test="$seetarget">
|
||||
- <xsl:value-of select="concat('#ientry-', generate-id($seetarget))"/>
|
||||
+ <xsl:text>#ientry-</xsl:text>
|
||||
+ <xsl:call-template name="object.id">
|
||||
+ <xsl:with-param name="object" select="$seetarget"/>
|
||||
+ </xsl:call-template>
|
||||
</xsl:if>
|
||||
</xsl:variable>
|
||||
|
||||
@@ -788,7 +792,10 @@
|
||||
|
||||
<xsl:variable name="linkend">
|
||||
<xsl:if test="$seealsotarget">
|
||||
- <xsl:value-of select="concat('#ientry-', generate-id($seealsotarget))"/>
|
||||
+ <xsl:text>#ientry-</xsl:text>
|
||||
+ <xsl:call-template name="object.id">
|
||||
+ <xsl:with-param name="object" select="$seealsotarget"/>
|
||||
+ </xsl:call-template>
|
||||
</xsl:if>
|
||||
</xsl:variable>
|
||||
|
@ -0,0 +1,30 @@
|
||||
Description: use EXSLT "replace" function when available
|
||||
A recursive implementation of string.subst is problematic,
|
||||
long strings with many matches will cause stack overflows.
|
||||
Author: Peter De Wachter <pdewacht@gmail.com>
|
||||
Bug-Debian: https://bugs.debian.org/750593
|
||||
|
||||
--- docbook-xsl-1.78.1+dfsg.orig/docbook-xsl/lib/lib.xsl
|
||||
+++ docbook-xsl-1.78.1+dfsg/docbook-xsl/lib/lib.xsl
|
||||
@@ -10,7 +10,10 @@
|
||||
|
||||
This module implements DTD-independent functions
|
||||
|
||||
- ******************************************************************** --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
|
||||
+ ******************************************************************** --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||
+ xmlns:str="http://exslt.org/strings"
|
||||
+ exclude-result-prefixes="str"
|
||||
+ version="1.0">
|
||||
|
||||
<xsl:template name="dot.count">
|
||||
<!-- Returns the number of "." characters in a string -->
|
||||
@@ -56,6 +59,9 @@
|
||||
<xsl:param name="replacement"/>
|
||||
|
||||
<xsl:choose>
|
||||
+ <xsl:when test="function-available('str:replace')">
|
||||
+ <xsl:value-of select="str:replace($string, string($target), string($replacement))"/>
|
||||
+ </xsl:when>
|
||||
<xsl:when test="contains($string, $target)">
|
||||
<xsl:variable name="rest">
|
||||
<xsl:call-template name="string.subst">
|
@ -0,0 +1,52 @@
|
||||
BINDIR = /usr/bin
|
||||
DESTDIR = ..overridden in spec file..
|
||||
|
||||
all: install
|
||||
|
||||
install: install-xsl install-img install-extensions install-misc install-epub
|
||||
|
||||
install-xsl:
|
||||
mkdir -p $(DESTDIR)/{common,eclipse,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,xhtml-1_1,manpages,profiling,highlighting,roundtrip,website}
|
||||
cp common/*.dtd $(DESTDIR)/common
|
||||
cp common/*.ent $(DESTDIR)/common
|
||||
cp common/*.xml $(DESTDIR)/common
|
||||
cp common/*.xsl $(DESTDIR)/common
|
||||
cp eclipse/*.xsl $(DESTDIR)/eclipse
|
||||
cp fo/*.xml $(DESTDIR)/fo
|
||||
cp fo/*.xsl $(DESTDIR)/fo
|
||||
cp html/*.xml $(DESTDIR)/html
|
||||
cp html/*.xsl $(DESTDIR)/html
|
||||
cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp
|
||||
cp javahelp/*.xsl $(DESTDIR)/javahelp
|
||||
cp lib/*.xsl $(DESTDIR)/lib
|
||||
cp template/*.xsl $(DESTDIR)/template
|
||||
cp xhtml/*.xsl $(DESTDIR)/xhtml
|
||||
cp xhtml-1_1/*.xsl $(DESTDIR)/xhtml-1_1
|
||||
cp manpages/*.xsl $(DESTDIR)/manpages
|
||||
cp profiling/*.xsl $(DESTDIR)/profiling
|
||||
cp highlighting/*.xml $(DESTDIR)/highlighting
|
||||
cp highlighting/*.xsl $(DESTDIR)/highlighting
|
||||
cp roundtrip/*.xml $(DESTDIR)/roundtrip
|
||||
cp roundtrip/*.xsl $(DESTDIR)/roundtrip
|
||||
cp roundtrip/*.dtd $(DESTDIR)/roundtrip
|
||||
cp website/*.xsl $(DESTDIR)/website
|
||||
|
||||
install-img:
|
||||
mkdir -p $(DESTDIR)/images/callouts
|
||||
cp images/*.gif $(DESTDIR)/images
|
||||
cp images/*.png $(DESTDIR)/images
|
||||
cp images/*.svg $(DESTDIR)/images
|
||||
cp images/callouts/*.png $(DESTDIR)/images/callouts
|
||||
cp images/callouts/*.gif $(DESTDIR)/images/callouts
|
||||
cp images/callouts/*.svg $(DESTDIR)/images/callouts
|
||||
|
||||
install-extensions:
|
||||
mkdir -p $(DESTDIR)/extensions
|
||||
cp -r extensions/* $(DESTDIR)/extensions
|
||||
|
||||
install-epub:
|
||||
mkdir -p $(DESTDIR)/epub
|
||||
cp -r epub/* ${DESTDIR}/epub
|
||||
|
||||
install-misc:
|
||||
cp VERSION $(DESTDIR)
|
@ -0,0 +1,110 @@
|
||||
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>
|
||||
<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>
|
||||
</xsl:variable>
|
||||
|
||||
@@ -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>
|
||||
- </fo:list-item-body>
|
||||
+ <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>
|
||||
|
||||
<xsl:choose>
|
||||
@@ -925,9 +941,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>
|
||||
@@ -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()">
|
||||
- <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>
|
@ -0,0 +1,19 @@
|
||||
diff -urNp docbook-xsl-1.76.1-orig/manpages/other.xsl docbook-xsl-1.76.1/manpages/other.xsl
|
||||
--- docbook-xsl-1.76.1-orig/manpages/other.xsl 2010-08-27 05:14:52.000000000 +0200
|
||||
+++ docbook-xsl-1.76.1/manpages/other.xsl 2011-09-06 17:17:07.973737258 +0200
|
||||
@@ -595,7 +595,14 @@ manvolnum
|
||||
<xsl:with-param name="message-prolog">Note: </xsl:with-param>
|
||||
<xsl:with-param name="message-epilog"> (soelim stub)</xsl:with-param>
|
||||
<xsl:with-param name="content">
|
||||
- <xsl:value-of select="'.so '"/>
|
||||
+ <xsl:choose>
|
||||
+ <xsl:when test="$man.output.in.separate.dir = 0">
|
||||
+ <xsl:value-of select="concat('.so man', $section, '/')"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:otherwise>
|
||||
+ <xsl:value-of select="'.so '"/> <!-- added case -->
|
||||
+ </xsl:otherwise>
|
||||
+ </xsl:choose>
|
||||
<xsl:variable name="full.filename">
|
||||
<xsl:call-template name="make.adjusted.man.filename">
|
||||
<xsl:with-param name="name" select="$first.refname"/>
|
@ -0,0 +1,53 @@
|
||||
diff -urNp docbook-xsl-1.78.0-orig/fo/lists.xsl docbook-xsl-1.78.0/fo/lists.xsl
|
||||
--- docbook-xsl-1.78.0-orig/fo/lists.xsl 2012-12-20 11:45:07.870679175 +0100
|
||||
+++ docbook-xsl-1.78.0/fo/lists.xsl 2012-12-20 11:55:31.440307881 +0100
|
||||
@@ -376,7 +376,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'">
|
||||
@@ -385,7 +385,7 @@
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="@termlength"/>
|
||||
- <xsl:text>em * 0.60</xsl:text>
|
||||
+ <xsl:text>em</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:when>
|
||||
@@ -394,7 +394,7 @@
|
||||
<xsl:with-param name="terms" select="varlistentry/term"/>
|
||||
<xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
|
||||
</xsl:call-template>
|
||||
- <xsl:text>em * 0.60</xsl:text>
|
||||
+ <xsl:text>em</xsl:text>
|
||||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:variable>
|
||||
@@ -409,8 +409,6 @@
|
||||
<xsl:variable name="label-separation">1em</xsl:variable>
|
||||
<xsl:variable name="distance-between-starts">
|
||||
<xsl:value-of select="$termlength"/>
|
||||
- <xsl:text>+</xsl:text>
|
||||
- <xsl:value-of select="$label-separation"/>
|
||||
</xsl:variable>
|
||||
|
||||
<xsl:if test="title">
|
||||
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>
|
||||
- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
|
||||
- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
|
||||
+ <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="text-align">
|
||||
<xsl:choose>
|
@ -0,0 +1,394 @@
|
||||
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"/>
|
||||
<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/utility.xsl"/>
|
||||
@@ -44,6 +45,7 @@
|
||||
<xsl:include href="graphics.xsl"/>
|
||||
<xsl:include href="xref.xsl"/>
|
||||
<xsl:include href="formal.xsl"/>
|
||||
+<xsl:include href="dtbl.xsl"/>
|
||||
<xsl:include href="table.xsl"/>
|
||||
<xsl:include href="htmltbl.xsl"/>
|
||||
<xsl:include href="sections.xsl"/>
|
||||
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"
|
||||
+ xmlns:exsl="http://exslt.org/common"
|
||||
+ xmlns:func="http://exslt.org/functions"
|
||||
+ xmlns:dtbl="http://docbook.sourceforge.net/dtbl"
|
||||
+ extension-element-prefixes="func"
|
||||
+ exclude-result-prefixes="exsl func dtbl"
|
||||
+ version="1.0">
|
||||
+
|
||||
+<func:function name="dtbl:convertLength">
|
||||
+ <xsl:param name="arbitrary.length"/>
|
||||
+
|
||||
+ <xsl:variable name="pixels.per.inch" select="96"/>
|
||||
+
|
||||
+ <xsl:variable name="unscaled.length"
|
||||
+ select="translate($arbitrary.length, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ', '')"/>
|
||||
+
|
||||
+ <xsl:variable name="units"
|
||||
+ select="translate($arbitrary.length,'+-0123456789. ', '')"/>
|
||||
+
|
||||
+ <xsl:variable name="scaled.length">
|
||||
+ <xsl:choose>
|
||||
+ <xsl:when test="$units='in'">
|
||||
+ <xsl:value-of select="$unscaled.length * $pixels.per.inch"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:when test="$units='cm'">
|
||||
+ <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 2.54)"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:when test="$units='mm'">
|
||||
+ <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 25.4)"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:when test="$units='pc'">
|
||||
+ <xsl:value-of select="$unscaled.length * (($pixels.per.inch div 72) * 12)"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:when test="$units='pt'">
|
||||
+ <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 72)"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:when test="$units='px' or $units=''">
|
||||
+ <xsl:value-of select="$unscaled.length"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:otherwise>
|
||||
+ <xsl:message terminate="no">
|
||||
+ <xsl:text>"</xsl:text>
|
||||
+ <xsl:value-of select="$units"/>
|
||||
+ <xsl:text>" is not a known unit. Applying scaling factor of 1 instead.</xsl:text>
|
||||
+ </xsl:message>
|
||||
+ <xsl:value-of select="$unscaled.length"/>
|
||||
+ </xsl:otherwise>
|
||||
+ </xsl:choose>
|
||||
+ </xsl:variable>
|
||||
+
|
||||
+ <func:result select="round($scaled.length)"/>
|
||||
+</func:function>
|
||||
+
|
||||
+<func:function name="dtbl:adjustColumnWidths">
|
||||
+ <xsl:param name="colgroup"/>
|
||||
+
|
||||
+ <xsl:if test="$adjustColumnWidths.debug">
|
||||
+ <xsl:message>
|
||||
+ <xsl:text>entering adjustColumnWidths(</xsl:text>
|
||||
+ <xsl:call-template name="dump-fragment">
|
||||
+ <xsl:with-param name="fragment" select="$colgroup"/>
|
||||
+ </xsl:call-template>
|
||||
+ <xsl:text>)</xsl:text>
|
||||
+ </xsl:message>
|
||||
+ </xsl:if>
|
||||
+
|
||||
+ <xsl:variable name="expanded.colgroup">
|
||||
+ <xsl:apply-templates select="exsl:node-set($colgroup)/*" mode="dtbl-split-widths"/>
|
||||
+ </xsl:variable>
|
||||
+
|
||||
+ <xsl:variable name="absolute.widths.total">
|
||||
+ <xsl:value-of select="sum(exsl:node-set($expanded.colgroup)//col/@abswidth)"/>
|
||||
+ </xsl:variable>
|
||||
+
|
||||
+ <xsl:variable name="relative.widths.total">
|
||||
+ <xsl:value-of select="sum(exsl:node-set($expanded.colgroup)//col/@relwidth)"/>
|
||||
+ </xsl:variable>
|
||||
+
|
||||
+ <xsl:if test="$adjustColumnWidths.debug">
|
||||
+ <xsl:message>
|
||||
+ <xsl:text>total relative widths = (</xsl:text>
|
||||
+ <xsl:value-of select="$relative.widths.total"/>
|
||||
+ <xsl:text>)</xsl:text>
|
||||
+ </xsl:message>
|
||||
+ <xsl:message>
|
||||
+ <xsl:text>total absolute widths = (</xsl:text>
|
||||
+ <xsl:value-of select="$absolute.widths.total"/>
|
||||
+ <xsl:text>)</xsl:text>
|
||||
+ </xsl:message>
|
||||
+ </xsl:if>
|
||||
+
|
||||
+ <xsl:variable name="adjusted.colgroup">
|
||||
+ <xsl:choose>
|
||||
+ <xsl:when test="$relative.widths.total = 0">
|
||||
+ <xsl:if test="$adjustColumnWidths.debug">
|
||||
+ <xsl:message>all widths are absolute</xsl:message>
|
||||
+ </xsl:if>
|
||||
+ <xsl:apply-templates select="exsl:node-set($expanded.colgroup)/*"
|
||||
+ mode="dtbl-use-absolute-widths"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:when test="$absolute.widths.total = 0">
|
||||
+ <xsl:if test="$adjustColumnWidths.debug">
|
||||
+ <xsl:message>all widths are relative</xsl:message>
|
||||
+ </xsl:if>
|
||||
+ <xsl:apply-templates select="exsl:node-set($expanded.colgroup)/*"
|
||||
+ mode="dtbl-use-relative-widths">
|
||||
+ <xsl:with-param name="relative.widths.total"
|
||||
+ select="$relative.widths.total"/>
|
||||
+ </xsl:apply-templates>
|
||||
+ </xsl:when>
|
||||
+ </xsl:choose>
|
||||
+ </xsl:variable>
|
||||
+
|
||||
+ <xsl:variable name="corrected.adjusted.colgroup">
|
||||
+ <xsl:choose>
|
||||
+ <xsl:when test="$relative.widths.total = 0">
|
||||
+ <xsl:copy-of select="$adjusted.colgroup"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:otherwise>
|
||||
+ <xsl:variable name="widths.total"
|
||||
+ select="sum(exsl:node-set($adjusted.colgroup)//col/@width)"/>
|
||||
+ <xsl:variable name="n.columns"
|
||||
+ select="count(exsl:node-set($adjusted.colgroup)//col)"/>
|
||||
+ <xsl:variable name="error"
|
||||
+ select="100 - $widths.total"/>
|
||||
+ <xsl:variable name="first.bad.column"
|
||||
+ select="($n.columns - $error) + 1"/>
|
||||
+ <xsl:apply-templates select="exsl:node-set($adjusted.colgroup)/*"
|
||||
+ mode="dtbl-correct-rounding-error">
|
||||
+ <xsl:with-param name="first.bad.column"
|
||||
+ select="$first.bad.column"/>
|
||||
+ </xsl:apply-templates>
|
||||
+ </xsl:otherwise>
|
||||
+ </xsl:choose>
|
||||
+ </xsl:variable>
|
||||
+
|
||||
+ <xsl:if test="$adjustColumnWidths.debug">
|
||||
+ <xsl:message>
|
||||
+ <xsl:text>result = (</xsl:text>
|
||||
+ <xsl:call-template name="dump-fragment">
|
||||
+ <xsl:with-param name="fragment" select="$corrected.adjusted.colgroup"/>
|
||||
+ </xsl:call-template>
|
||||
+ <xsl:text>)</xsl:text>
|
||||
+ </xsl:message>
|
||||
+ </xsl:if>
|
||||
+
|
||||
+ <func:result select="$corrected.adjusted.colgroup"/>
|
||||
+</func:function>
|
||||
+
|
||||
+<xsl:template match="colgroup" mode="dtbl-correct-rounding-error">
|
||||
+ <xsl:param name="first.bad.column"/>
|
||||
+
|
||||
+ <xsl:if test="$adjustColumnWidths.debug">
|
||||
+ <xsl:message>
|
||||
+ <xsl:text>first.bad.column = (</xsl:text>
|
||||
+ <xsl:value-of select="$first.bad.column"/>
|
||||
+ <xsl:text>)</xsl:text>
|
||||
+ </xsl:message>
|
||||
+ </xsl:if>
|
||||
+
|
||||
+ <colgroup>
|
||||
+ <xsl:for-each select="col[position() < $first.bad.column]">
|
||||
+ <xsl:element name="col">
|
||||
+ <xsl:attribute name="width">
|
||||
+ <xsl:value-of select="concat(@width, '%')"/>
|
||||
+ </xsl:attribute>
|
||||
+ </xsl:element>
|
||||
+ </xsl:for-each>
|
||||
+ <xsl:for-each select="col[position() >= $first.bad.column]">
|
||||
+ <xsl:element name="col">
|
||||
+ <xsl:attribute name="width">
|
||||
+ <xsl:value-of select="concat(@width + 1, '%')"/>
|
||||
+ </xsl:attribute>
|
||||
+ </xsl:element>
|
||||
+ </xsl:for-each>
|
||||
+ </colgroup>
|
||||
+</xsl:template>
|
||||
+
|
||||
+<xsl:template match="col" mode="dtbl-correct-rounding-error">
|
||||
+ <xsl:param name="relative.widths.total"/>
|
||||
+ <xsl:param name="error"/>
|
||||
+
|
||||
+ <xsl:element name="col">
|
||||
+ <xsl:attribute name="width">
|
||||
+ <xsl:value-of select="concat('', round((@relwidth div $relative.widths.total) * 100))"/>
|
||||
+ </xsl:attribute>
|
||||
+ <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
|
||||
+ </xsl:element>
|
||||
+</xsl:template>
|
||||
+
|
||||
+<xsl:template match="colgroup" mode="dtbl-use-relative-widths">
|
||||
+ <xsl:param name="relative.widths.total"/>
|
||||
+
|
||||
+ <colgroup>
|
||||
+ <xsl:apply-templates mode="dtbl-use-relative-widths">
|
||||
+ <xsl:with-param name="relative.widths.total"
|
||||
+ select="$relative.widths.total"/>
|
||||
+ </xsl:apply-templates>
|
||||
+ </colgroup>
|
||||
+</xsl:template>
|
||||
+
|
||||
+<xsl:template match="col" mode="dtbl-use-relative-widths">
|
||||
+ <xsl:param name="relative.widths.total"/>
|
||||
+
|
||||
+ <xsl:element name="col">
|
||||
+ <xsl:attribute name="width">
|
||||
+ <xsl:value-of select="round((@relwidth div $relative.widths.total) * 100)"/>
|
||||
+ </xsl:attribute>
|
||||
+ <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
|
||||
+ </xsl:element>
|
||||
+</xsl:template>
|
||||
+
|
||||
+<xsl:template match="colgroup" mode="dtbl-use-absolute-widths">
|
||||
+ <colgroup>
|
||||
+ <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
|
||||
+ </colgroup>
|
||||
+</xsl:template>
|
||||
+
|
||||
+<xsl:template match="col" mode="dtbl-use-absolute-widths">
|
||||
+ <xsl:element name="col">
|
||||
+ <xsl:attribute name="width">
|
||||
+ <xsl:value-of select="@abswidth"/>
|
||||
+ </xsl:attribute>
|
||||
+ <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
|
||||
+ </xsl:element>
|
||||
+</xsl:template>
|
||||
+
|
||||
+<xsl:template match="colgroup" mode="dtbl-split-widths">
|
||||
+ <colgroup>
|
||||
+ <xsl:apply-templates mode="dtbl-split-widths"/>
|
||||
+ </colgroup>
|
||||
+</xsl:template>
|
||||
+
|
||||
+<xsl:template match="col" mode="dtbl-split-widths">
|
||||
+
|
||||
+ <!-- width = @width ? @width : '1*' -->
|
||||
+ <xsl:variable name="width">
|
||||
+ <xsl:choose>
|
||||
+ <xsl:when test="@width != ''">
|
||||
+ <xsl:value-of select="@width"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:otherwise>
|
||||
+ <xsl:text>1*</xsl:text>
|
||||
+ </xsl:otherwise>
|
||||
+ </xsl:choose>
|
||||
+ </xsl:variable>
|
||||
+
|
||||
+ <!-- absolute.width = contains($width,'*') ? substring-after($width, '*') : $width -->
|
||||
+ <xsl:variable name="absolute.width">
|
||||
+ <xsl:choose>
|
||||
+ <xsl:when test="contains($width, '*')">
|
||||
+ <xsl:value-of select="substring-after($width, '*')"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:otherwise>
|
||||
+ <xsl:value-of select="$width"/>
|
||||
+ </xsl:otherwise>
|
||||
+ </xsl:choose>
|
||||
+ </xsl:variable>
|
||||
+
|
||||
+ <xsl:variable name="converted.absolute.width">
|
||||
+ <xsl:choose>
|
||||
+ <xsl:when test="$absolute.width != ''">
|
||||
+ <xsl:value-of select="dtbl:convertLength($absolute.width)"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:otherwise>0</xsl:otherwise>
|
||||
+ </xsl:choose>
|
||||
+ </xsl:variable>
|
||||
+
|
||||
+ <xsl:variable name="relative.width">
|
||||
+ <xsl:choose>
|
||||
+ <xsl:when test="substring-before($width, '*') != ''">
|
||||
+ <xsl:value-of select="substring-before($width, '*')"/>
|
||||
+ </xsl:when>
|
||||
+ <xsl:otherwise>0</xsl:otherwise>
|
||||
+ </xsl:choose>
|
||||
+ </xsl:variable>
|
||||
+
|
||||
+ <xsl:element name="col">
|
||||
+ <xsl:attribute name="width">
|
||||
+ <xsl:value-of select="$width"/>
|
||||
+ </xsl:attribute>
|
||||
+ <xsl:attribute name="relwidth">
|
||||
+ <xsl:value-of select="$relative.width"/>
|
||||
+ </xsl:attribute>
|
||||
+ <xsl:attribute name="abswidth">
|
||||
+ <xsl:value-of select="$converted.absolute.width"/>
|
||||
+ </xsl:attribute>
|
||||
+ <xsl:apply-templates mode="dtbl-split-widths"/>
|
||||
+ </xsl:element>
|
||||
+</xsl:template>
|
||||
+
|
||||
+</xsl:stylesheet>
|
||||
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"
|
||||
xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table"
|
||||
- exclude-result-prefixes="doc stbl xtbl lxslt ptbl"
|
||||
+ xmlns:dtbl="http://docbook.sourceforge.net/dtbl"
|
||||
+ exclude-result-prefixes="doc stbl xtbl lxslt ptbl dtbl"
|
||||
version='1.0'>
|
||||
|
||||
<xsl:include href="../common/table.xsl"/>
|
||||
@@ -365,6 +366,9 @@
|
||||
<xsl:when test="$use.extensions != 0
|
||||
and $tablecolumns.extension != 0">
|
||||
<xsl:choose>
|
||||
+ <xsl:when test="function-available('dtbl:convertLength')">
|
||||
+ <xsl:value-of select="dtbl:convertLength($table.width)"/>
|
||||
+ </xsl:when>
|
||||
<xsl:when test="function-available('stbl:convertLength')">
|
||||
<xsl:value-of select="stbl:convertLength($table.width)"/>
|
||||
</xsl:when>
|
||||
@@ -389,6 +393,9 @@
|
||||
<xsl:when test="$use.extensions != 0
|
||||
and $tablecolumns.extension != 0">
|
||||
<xsl:choose>
|
||||
+ <xsl:when test="function-available('dtbl:adjustColumnWidths')">
|
||||
+ <xsl:copy-of select="dtbl:adjustColumnWidths($colgroup)"/>
|
||||
+ </xsl:when>
|
||||
<xsl:when test="function-available('stbl:adjustColumnWidths')">
|
||||
<xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/>
|
||||
</xsl:when>
|
||||
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"
|
||||
+ xmlns:exsl="http://exslt.org/common"
|
||||
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||
+ xmlns="http://www.w3.org/1999/xhtml"
|
||||
+ exclude-result-prefixes="exsl">
|
||||
+
|
||||
+<xsl:template name="dump-fragment">
|
||||
+ <xsl:param name="fragment"/>
|
||||
+ <xsl:apply-templates select="exsl:node-set($fragment)/*" mode="dump-fragment"/>
|
||||
+</xsl:template>
|
||||
+
|
||||
+<xsl:template match="@*" mode="dump-fragment">
|
||||
+ <xsl:text> </xsl:text>
|
||||
+ <xsl:value-of select="local-name(.)"/>
|
||||
+ <xsl:text>="</xsl:text>
|
||||
+ <xsl:value-of select="."/>
|
||||
+ <xsl:text>"</xsl:text>
|
||||
+</xsl:template>
|
||||
+
|
||||
+<xsl:template match="*" mode="dump-fragment">
|
||||
+ <xsl:text><</xsl:text><xsl:value-of select="local-name(.)"/>
|
||||
+ <xsl:apply-templates select="@*" mode="dump-fragment"/>
|
||||
+ <xsl:text>></xsl:text>
|
||||
+ <xsl:apply-templates mode="dump-fragment"/>
|
||||
+ <xsl:text></</xsl:text><xsl:value-of select="local-name(.)"/>
|
||||
+ <xsl:text>></xsl:text>
|
||||
+</xsl:template>
|
||||
+
|
||||
+</xsl:stylesheet>
|
||||
diff -urNp docbook-xsl-1.76.0-orig/html/param.xsl docbook-xsl-1.76.0/html/param.xsl
|
||||
--- docbook-xsl-1.76.0-orig/html/param.xsl 2010-08-31 09:27:22.000000000 +0200
|
||||
+++ docbook-xsl-1.76.0/html/param.xsl 2010-09-06 11:01:07.916914161 +0200
|
||||
@@ -68,6 +68,7 @@ div.annotation-close { position: absolut
|
||||
http://cdn.docbook.org/release/xsl/images/annot-close.png</xsl:param>
|
||||
<xsl:param name="annotation.graphic.open">http://cdn.docbook.org/release/xsl/images/annot-open.png</xsl:param>
|
||||
|
||||
+<xsl:param name="adjustColumnWidths.debug" select="false()"/>
|
||||
<xsl:param name="annotation.js">
|
||||
<xsl:text>http://cdn.docbook.org/release/xsl/script/AnchorPosition.js http://cdn.docbook.org/release/xsl/script/PopupWindow.js</xsl:text></xsl:param>
|
||||
|
@ -0,0 +1,25 @@
|
||||
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>
|
||||
<xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
|
||||
- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
|
||||
- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
|
||||
+ <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="text-align">center</xsl:attribute>
|
||||
</xsl:attribute-set>
|
||||
@@ -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>
|
||||
- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master,'pt * 0.8')"/></xsl:attribute>
|
||||
- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master,'pt * 1.2')"/></xsl:attribute>
|
||||
+ <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="start-indent">0pt</xsl:attribute>
|
||||
</xsl:attribute-set>
|
||||
<xsl:attribute-set name="index.entry.properties">
|
@ -0,0 +1,281 @@
|
||||
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,45 +1697,99 @@
|
||||
<xsl:with-param name="gentext-key" select="$gentext-key"/>
|
||||
</xsl:call-template>
|
||||
|
||||
- <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: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>
|
||||
- </fo:table-column>
|
||||
- <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: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>
|
||||
- </fo:table-column>
|
||||
- <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: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>
|
||||
- </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: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>
|
||||
+ </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: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>
|
||||
+ </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: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>
|
||||
+ </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: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>
|
||||
+ </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: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>
|
||||
+ </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: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>
|
||||
+ </fo:table-column>
|
||||
+ </xsl:otherwise>
|
||||
+ </xsl:choose>
|
||||
|
||||
<fo:table-body>
|
||||
<fo:table-row>
|
||||
@@ -2021,45 +2066,99 @@
|
||||
<xsl:with-param name="sequence" select="$sequence"/>
|
||||
<xsl:with-param name="gentext-key" select="$gentext-key"/>
|
||||
</xsl:call-template>
|
||||
- <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: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>
|
||||
- </fo:table-column>
|
||||
- <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: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>
|
||||
- </fo:table-column>
|
||||
- <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: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>
|
||||
- </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: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>
|
||||
+ </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: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>
|
||||
+ </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: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>
|
||||
+ </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: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>
|
||||
+ </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: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>
|
||||
+ </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: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>
|
||||
+ </fo:table-column>
|
||||
+ </xsl:otherwise>
|
||||
+ </xsl:choose>
|
||||
|
||||
<fo:table-body>
|
||||
<fo:table-row>
|
@ -0,0 +1,548 @@
|
||||
Name: docbook-style-xsl
|
||||
Version: 1.79.2
|
||||
Release: 9%{?dist}
|
||||
Group: Applications/Text
|
||||
|
||||
Summary: Norman Walsh's XSL stylesheets for DocBook XML
|
||||
|
||||
License: DMIT
|
||||
URL: https://github.com/docbook/xslt10-stylesheets
|
||||
|
||||
Provides: docbook-xsl = %{version}
|
||||
Requires: docbook-dtd-xml
|
||||
# xml-common was using /usr/share/xml until 0.6.3-8.
|
||||
Requires: xml-common >= 0.6.3-8
|
||||
# libxml2 required because of usage of /usr/bin/xmlcatalog
|
||||
Requires(post): libxml2 >= 2.4.8
|
||||
Requires(postun): libxml2 >= 2.4.8
|
||||
# PassiveTeX before 1.21 can't handle the newer stylesheets.
|
||||
Conflicts: passivetex < 1.21
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
|
||||
BuildArch: noarch
|
||||
Source0: https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F{%version}/docbook-xsl-nons-%{version}.tar.bz2
|
||||
Source1: %{name}.Makefile
|
||||
Source2: https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F{%version}/docbook-xsl-doc-%{version}.tar.bz2
|
||||
|
||||
|
||||
#Avoid proportional-column-width for passivetex (bug #176766).
|
||||
Patch1: docbook-xsl-pagesetup.patch
|
||||
#Hard-code the margin-left work around to expect passivetex (bug #113456).
|
||||
Patch2: docbook-xsl-marginleft.patch
|
||||
#fix of #161619 - adjustColumnWidths now available
|
||||
Patch3: docbook-xsl-newmethods.patch
|
||||
#change a few non-constant expressions to constant - needed for passivetex(#366441)
|
||||
Patch4: docbook-xsl-non-constant-expressions.patch
|
||||
#added fixes for passivetex extension and list-item-body(#161371)
|
||||
Patch5: docbook-xsl-list-item-body.patch
|
||||
#workaround missing mandir section problem (#727251)
|
||||
Patch6: docbook-xsl-mandir.patch
|
||||
#Non-recursive string.subst that doesn't kill smb.conf.5 generation
|
||||
Patch7: docbook-style-xsl-non-recursive-string-subst.patch
|
||||
#Fix generate consistent IDs so it doesn't cause multilib conflicts (#1761964)
|
||||
Patch8: docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch
|
||||
|
||||
%description
|
||||
These XSL stylesheets allow you to transform any DocBook XML document to
|
||||
other formats, such as HTML, FO, and XHMTL. They are highly customizable.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -c -T -n docbook-xsl-%{version}
|
||||
tar jxf %{SOURCE0}
|
||||
mv docbook-xsl-nons-%{version}/* .
|
||||
pushd ..
|
||||
tar jxf %{SOURCE2}
|
||||
popd
|
||||
%patch1 -p1 -b .pagesetup
|
||||
%patch2 -p1 -b .marginleft
|
||||
%patch3 -p1 -b .newmethods
|
||||
%patch4 -p1 -b .nonconstant
|
||||
%patch5 -p1 -b .listitembody
|
||||
%patch6 -p1 -b .mandir
|
||||
%patch7 -p2 -b .non-recursive-subst
|
||||
%patch8 -p1 -b .genconstids
|
||||
|
||||
cp -p %{SOURCE1} Makefile
|
||||
|
||||
# fix of non UTF-8 files rpmlint warnings
|
||||
for fhtml in $(find ./doc -name '*.html' -type f)
|
||||
do
|
||||
iconv -f ISO-8859-1 -t UTF-8 "$fhtml" -o "$fhtml".tmp
|
||||
mv -f "$fhtml".tmp "$fhtml"
|
||||
sed -i 's/charset=ISO-8859-1/charset=UTF-8/' "$fhtml"
|
||||
done
|
||||
|
||||
for f in $(find -name "*'*")
|
||||
do
|
||||
mv -v "$f" $(echo "$f" | tr -d "'")
|
||||
done
|
||||
|
||||
|
||||
%build
|
||||
|
||||
|
||||
%install
|
||||
DESTDIR=$RPM_BUILD_ROOT
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install BINDIR=$DESTDIR%{_bindir} DESTDIR=$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}
|
||||
cp -a VERSION.xsl $DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}/VERSION.xsl
|
||||
ln -s xsl-stylesheets-%{version} \
|
||||
$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets
|
||||
|
||||
# Don't ship the extensions (bug #177256).
|
||||
rm -rf $DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets/extensions/*
|
||||
|
||||
|
||||
%clean
|
||||
DESTDIR=$RPM_BUILD_ROOT
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr (-,root,root,-)
|
||||
%doc BUGS
|
||||
%doc README
|
||||
%doc TODO
|
||||
%doc doc
|
||||
%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}
|
||||
%{_datadir}/sgml/docbook/xsl-stylesheets
|
||||
|
||||
|
||||
%post
|
||||
CATALOG=%{_sysconfdir}/xml/catalog
|
||||
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
|
||||
"http://cdn.docbook.org/release/xsl-nons/%{version}" \
|
||||
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
|
||||
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
|
||||
"http://cdn.docbook.org/release/xsl-nons/%{version}" \
|
||||
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
|
||||
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
|
||||
"http://cdn.docbook.org/release/xsl-nons/current/" \
|
||||
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
|
||||
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
|
||||
"http://cdn.docbook.org/release/xsl-nons/current/" \
|
||||
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
|
||||
#keep the old one sourceforge URIs at least temporarily
|
||||
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
|
||||
"http://docbook.sourceforge.net/release/xsl/current" \
|
||||
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
|
||||
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
|
||||
"http://docbook.sourceforge.net/release/xsl/current" \
|
||||
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
|
||||
|
||||
|
||||
|
||||
%postun
|
||||
# remove entries only on removal of package
|
||||
if [ "$1" = 0 ]; then
|
||||
CATALOG=%{_sysconfdir}/xml/catalog
|
||||
%{_bindir}/xmlcatalog --noout --del \
|
||||
"file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
|
||||
fi
|
||||
|
||||
%changelog
|
||||
* Wed Jan 20 2021 Ondrej Vasik <ovasik@redhat.com> - 1.79.2-9
|
||||
- fix generate consistent IDs issue (#1761964)
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Sep 13 2017 Alexander Bokovoy <abokovoy@redhat.com> - 1.79.2-6
|
||||
- Use non-recursive string.subst to allow building large documents like smb.conf.5
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.79.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Jan 03 2017 Ondrej Vasik <ovasik@redhat.com> - 1.79.2-3
|
||||
- keep old sourceforge entries at least temporarily (#1409587)
|
||||
|
||||
* Mon Jan 02 2017 Ondrej Vasik <ovasik@redhat.com> - 1.79.2-2
|
||||
- update xmlcatalog entries to docbook.org cdn
|
||||
|
||||
* Mon Jan 02 2017 Ondrej Vasik <ovasik@redhat.com> - 1.79.2-1
|
||||
- new upstream release 1.79.2
|
||||
- upstream moved to github
|
||||
|
||||
* Fri Jul 08 2016 Ondrej Vasik <ovasik@redhat.com> - 1.79.1-1
|
||||
- new upstream release 1.79.1
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.78.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.78.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.78.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Mon Jul 29 2013 Ondrej Vasik <ovasik@redhat.com> 1.78.1-2
|
||||
- use DMIT (modified MIT) as a license for the
|
||||
stylesheets (#988715)
|
||||
|
||||
* Mon Mar 18 2013 Ondrej Vasik <ovasik@redhat.com> 1.78.1-1
|
||||
- new upstream release 1.78.1
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.78.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Thu Dec 20 2012 Ondrej Vasik <ovasik@redhat.com> 1.78.0-1
|
||||
- new upstream release 1.78.0
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.77.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Jun 5 2012 Ondrej Vasik <ovasik@redhat.com> 1.77.1-2
|
||||
- ship VERSION.xsl file (#829014)
|
||||
|
||||
* Tue Jun 5 2012 Ondrej Vasik <ovasik@redhat.com> 1.77.1-1
|
||||
- new stable upstream release 1.77.1
|
||||
- defuzz patches
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.76.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Sep 6 2011 Ondrej Vasik <ovasik@redhat.com> 1.76.1-4
|
||||
- revert previous change, workaround the mandir links issue
|
||||
in buildroot (#727251)
|
||||
|
||||
* Mon Aug 29 2011 Ondrej Vasik <ovasik@redhat.com> 1.76.1-3
|
||||
- make man.output.in.separate.dir "on" by default (#727251)
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.76.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Tue Nov 02 2010 Ondrej Vasik <ovasik@redhat.com> 1.76.1-1
|
||||
- new upstream release 1.76.1
|
||||
|
||||
* Mon Sep 06 2010 Ondrej Vasik <ovasik@redhat.com> 1.76.0-1
|
||||
- new upstream release 1.76.0
|
||||
|
||||
* Tue May 04 2010 Ondrej Vasik <ovasik@redhat.com> 1.75.2-6
|
||||
- ship eclipse help stylesheets(#588613)
|
||||
|
||||
* Fri Dec 18 2009 Ondrej Vasik <ovasik@redhat.com> 1.75.2-5
|
||||
- comment patches purpose
|
||||
- License Copyright only
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.75.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Thu Jul 23 2009 Ondrej Vasik <ovasik@redhat.com> 1.75.2-3
|
||||
- upstream changed changed doc tarball after release
|
||||
(empty reference pdf file in old tarball)
|
||||
|
||||
* Wed Jul 22 2009 Ondrej Vasik <ovasik@redhat.com> 1.75.2-2
|
||||
- upstream changed tarballs after release
|
||||
|
||||
* Tue Jul 21 2009 Ondrej Vasik <ovasik@redhat.com> 1.75.2-1
|
||||
- New upstream release 1.75.2
|
||||
|
||||
* Thu May 28 2009 Ondrej Vasik <ovasik@redhat.com> 1.75.1-1
|
||||
- New upstream release 1.75.1
|
||||
|
||||
* Mon May 11 2009 Ondrej Vasik <ovasik@redhat.com> 1.75.0-1
|
||||
- New upstream release 1.75.0
|
||||
- update marginleft patch
|
||||
|
||||
* Wed Mar 11 2009 Ondrej Vasik <ovasik@redhat.com> 1.74.3-1
|
||||
- New upstream release 1.74.3
|
||||
|
||||
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.74.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Mon Feb 23 2009 Ondrej Vasik <ovasik@redhat.com> 1.74.2-2
|
||||
- updated Makefile: do ship .svg images(#486849), xsl
|
||||
stylesheets for website, xhtml-1_1, docbook -> epub
|
||||
convertor
|
||||
|
||||
* Fri Feb 20 2009 Ondrej Vasik <ovasik@redhat.com> 1.74.2-1
|
||||
- New upstream release 1.74.2
|
||||
|
||||
* Wed Feb 18 2009 Ondrej Vasik <ovasik@redhat.com> 1.74.1-1
|
||||
- New upstream release, removed included patches
|
||||
|
||||
* Wed Feb 11 2009 Ondrej Vasik <ovasik@redhat.com> 1.74.0-7
|
||||
- fix broken varlistentry (#479683)
|
||||
|
||||
* Mon Feb 02 2009 Ondrej Vasik <ovasik@redhat.com> 1.74.0-6
|
||||
- fix improper localization for rtl languages, thanks
|
||||
Muayyad Alsadi(#475077)
|
||||
|
||||
* Wed Jan 28 2009 Ondrej Vasik <ovasik@redhat.com> 1.74.0-5
|
||||
- fix xsl stylesheets for rtl languages(#475077)
|
||||
|
||||
* Fri Dec 12 2008 Ondrej Vasik <ovasik@redhat.com> 1.74.0-4
|
||||
- Author_Group "<orgname>" merged between "<surname>"
|
||||
and "<surname>" (#473019)
|
||||
|
||||
* 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)
|
||||
|
||||
* 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)
|
||||
|
||||
* Tue Dec 11 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-8
|
||||
- remove entries from xmlcatalog only on removal of package
|
||||
(required because of the change with droping release
|
||||
-caused drop of catalog entries during update)
|
||||
|
||||
* Tue Dec 04 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-7
|
||||
- change a few non-constant expressions to constant that
|
||||
could now be handled by passivetex(#366441)
|
||||
|
||||
* 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
|
||||
- convert all html files in doc to UTF-8 in prep
|
||||
(latest rpmlint gives warnings)
|
||||
- no longer using release in style-xsl dir(#389231)
|
||||
|
||||
* Tue Nov 06 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-4
|
||||
- Merge review(#225704)
|
||||
- spec file modified to follow guidelines
|
||||
|
||||
* Wed Oct 24 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-3
|
||||
- rpmlint check
|
||||
- fixed License Tag, Requires and some cosmetic issues
|
||||
|
||||
* Fri Sep 7 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-2
|
||||
- Added PreReq of libxml2(#253962)
|
||||
|
||||
* Wed Sep 5 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.2-1
|
||||
- new upstream version
|
||||
|
||||
* Thu Aug 30 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.1-2
|
||||
- removed patch for #249294(included in new version other way)
|
||||
|
||||
* Wed Aug 29 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.1-1
|
||||
- new upstream version(fixing some bugs)
|
||||
- small new-methods patch change
|
||||
|
||||
* Mon Jul 23 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.0-2
|
||||
- fixed manpages/docbook.xsl failure(Tim Waugh,#249294)
|
||||
|
||||
* Mon Jul 23 2007 Ondrej Vasik <ovasik@redhat.com> 1.73.0-1
|
||||
- update to latest upstream version
|
||||
- patch changes because of rejects
|
||||
|
||||
* Mon Jun 18 2007 Ondrej Vasik <ovasik@redhat.com> 1.72.0-3
|
||||
- patch fixing #161619 taken from upstream
|
||||
|
||||
* Wed Jan 24 2007 Tomas Mraz <tmraz@redhat.com> 1.72.0-2
|
||||
- Install missing *.ent from common.
|
||||
|
||||
* Tue Jan 23 2007 Tim Waugh <twaugh@redhat.com> 1.72.0-1
|
||||
- 1.72.0.
|
||||
|
||||
* Fri Jan 19 2007 Tomas Mraz <tmraz@redhat.com> 1.71.1-2
|
||||
- Add new wordml and especially highlighting (which is referenced
|
||||
from html) subdirs to Makefile.
|
||||
|
||||
* Fri Jan 19 2007 Tim Waugh <twaugh@redhat.com> 1.71.1-1
|
||||
- 1.71.1. No longer seem to need lists patch. Removed out of date sp
|
||||
patch.
|
||||
|
||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.69.1-5.1
|
||||
- rebuild
|
||||
|
||||
* Tue Jan 24 2006 Tim Waugh <twaugh@redhat.com> 1.69.1-5
|
||||
- Don't ship docsrc/* (bug #177256).
|
||||
- Don't ship the extensions (bug #177256).
|
||||
|
||||
* Thu Jan 19 2006 Tim Waugh <twaugh@redhat.com> 1.69.1-4
|
||||
- Better 'lists' patch (bug #161371).
|
||||
|
||||
* Thu Jan 19 2006 Tim Waugh <twaugh@redhat.com> 1.69.1-3
|
||||
- Apply patch to fix simpara manpage output, which asciidoc tends to use
|
||||
(bug #175592).
|
||||
|
||||
* Tue Jan 3 2006 Tim Waugh <twaugh@redhat.com> 1.69.1-2
|
||||
- Patches from W. Michael Petullo:
|
||||
- Fix lists blocking (bug #161371).
|
||||
- Avoid proportional-column-width for passivetex (bug #176766).
|
||||
|
||||
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Fri Aug 12 2005 Tim Waugh <twaugh@redhat.com> 1.69.1-1
|
||||
- 1.69.1.
|
||||
|
||||
* Mon Jul 18 2005 Tim Waugh <twaugh@redhat.com> 1.69.0-1
|
||||
- 1.69.0.
|
||||
|
||||
* Mon Feb 14 2005 Tim Waugh <twaugh@redhat.com> 1.68.1-1
|
||||
- 1.68.1.
|
||||
|
||||
* Wed Feb 9 2005 Tim Waugh <twaugh@redhat.com> 1.68.0-1
|
||||
- 1.68.0.
|
||||
|
||||
* Wed Dec 8 2004 Tim Waugh <twaugh@redhat.com> 1.67.2-2
|
||||
- Prevent expressions in passivetex output from index.xsl (bug #142229).
|
||||
|
||||
* Thu Dec 2 2004 Tim Waugh <twaugh@redhat.com> 1.67.2-1
|
||||
- 1.67.2.
|
||||
- No longer need nbsp or listblock patches.
|
||||
|
||||
* Mon Nov 22 2004 Tim Waugh <twaugh@redhat.com> 1.67.0-3
|
||||
- Avoid non-ASCII in generated man pages.
|
||||
|
||||
* Wed Nov 10 2004 Tim Waugh <twaugh@redhat.com> 1.67.0-1
|
||||
- 1.67.0.
|
||||
|
||||
* Tue Nov 2 2004 Tim Waugh <twaugh@redhat.com> 1.66.1-1
|
||||
- 1.66.1 (bug #133586).
|
||||
|
||||
* Fri Jun 4 2004 Tim Waugh <twaugh@redhat.com> 1.65.1-2
|
||||
- Fix strange filenames (bug #125311).
|
||||
|
||||
* Tue Mar 9 2004 Tim Waugh <twaugh@redhat.com> 1.65.1-1
|
||||
- 1.65.1.
|
||||
|
||||
* Mon Mar 1 2004 Tim Waugh <twaugh@redhat.com> 1.65.0-1
|
||||
- 1.65.0.
|
||||
|
||||
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Tue Jan 20 2004 Tim Waugh <twaugh@redhat.com> 1.64.1-6
|
||||
- Fix last margin-left fix (bug #113456).
|
||||
- Reduce instances of itemized/ordered lists having misalignments.
|
||||
|
||||
* Sun Jan 18 2004 Tim Waugh <twaugh@redhat.com> 1.64.1-5
|
||||
- And another (bug #113456).
|
||||
|
||||
* Thu Jan 15 2004 Tim Waugh <twaugh@redhat.com> 1.64.1-4
|
||||
- Fixed another instance of bug #113456 in lists layout.
|
||||
|
||||
* Wed Jan 14 2004 Tim Waugh <twaugh@redhat.com> 1.64.1-3
|
||||
- Hard-code the margin-left work around to expect passivetex (bug #113456).
|
||||
|
||||
* Wed Dec 24 2003 Tim Waugh <twaugh@redhat.com> 1.64.1-2
|
||||
- Another manpage fix.
|
||||
|
||||
* Fri Dec 19 2003 Tim Waugh <twaugh@redhat.com> 1.64.1-1
|
||||
- 1.64.1.
|
||||
|
||||
* Thu Dec 18 2003 Tim Waugh <twaugh@redhat.com> 1.64.0-2
|
||||
- Another manpage fix.
|
||||
|
||||
* Tue Dec 16 2003 Tim Waugh <twaugh@redhat.com> 1.64.0-1
|
||||
- 1.64.0.
|
||||
|
||||
* Fri Dec 12 2003 Tim Waugh <twaugh@redhat.com> 1.62.4-3
|
||||
- Use the fr.xml from 1.62.1 (bug #111989).
|
||||
|
||||
* Thu Dec 11 2003 Tim Waugh <twaugh@redhat.com> 1.62.4-2
|
||||
- Manpages fixes.
|
||||
|
||||
* Thu Dec 11 2003 Tim Waugh <twaugh@redhat.com> 1.62.4-1
|
||||
- 1.62.4.
|
||||
- No longer need hyphens patch.
|
||||
- Avoid expressions in margin-left attributes, since passivetex does not
|
||||
understand them.
|
||||
|
||||
* Fri Jul 4 2003 Tim Waugh <twaugh@redhat.com> 1.61.2-2.1
|
||||
- Rebuilt.
|
||||
|
||||
* Fri Jul 4 2003 Tim Waugh <twaugh@redhat.com> 1.61.2-2
|
||||
- Rebuilt.
|
||||
|
||||
* Fri May 23 2003 Tim Waugh <twaugh@redhat.com> 1.61.2-1
|
||||
- 1.61.2.
|
||||
|
||||
* Sun May 18 2003 Tim Waugh <twaugh@redhat.com> 1.61.1-1
|
||||
- 1.61.1.
|
||||
|
||||
* Fri May 9 2003 Tim Waugh <twaugh@redhat.com> 1.61.0-1
|
||||
- Prevent hyphenation-character confusing passivetex.
|
||||
- 1.61.0.
|
||||
|
||||
* Thu Mar 6 2003 Tim Waugh <twaugh@redhat.com> 1.60.1-1
|
||||
- 1.60.1.
|
||||
|
||||
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Mon Dec 2 2002 Tim Waugh <twaugh@redhat.com> 1.58.1-1
|
||||
- 1.58.1.
|
||||
- No longer need marker patch.
|
||||
|
||||
* Mon Nov 4 2002 Tim Waugh <twaugh@redhat.com> 1.57.0-2
|
||||
- Ship profiling directory (bug #77191).
|
||||
|
||||
* Tue Oct 22 2002 Tim Waugh <twaugh@redhat.com> 1.57.0-1
|
||||
- 1.57.0.
|
||||
|
||||
* Wed Oct 16 2002 Tim Waugh <twaugh@redhat.com> 1.56.1-1
|
||||
- 1.56.1.
|
||||
- Use value-of not copy-of for fo:marker content.
|
||||
- Conflict with passivetex < 1.21.
|
||||
|
||||
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
|
||||
- automated rebuild
|
||||
|
||||
* Thu May 23 2002 Tim Powers <timp@redhat.com>
|
||||
- automated rebuild
|
||||
|
||||
* Wed May 1 2002 Tim Waugh <twaugh@redhat.com> 1.50.0-1
|
||||
- 1.50.0.
|
||||
|
||||
* Thu Feb 21 2002 Tim Waugh <twaugh@redhat.com> 1.49-1
|
||||
- 1.49.
|
||||
- Rebuild in new environment.
|
||||
|
||||
* Fri Feb 1 2002 Tim Waugh <twaugh@redhat.com> 1.48-4
|
||||
- Put URIs instead of pathnames in the XML catalog.
|
||||
|
||||
* Thu Jan 17 2002 Tim Waugh <twaugh@redhat.com> 1.48-3
|
||||
- Back to /usr/share/sgml.
|
||||
|
||||
* Wed Jan 09 2002 Tim Powers <timp@redhat.com> 1.48-2
|
||||
- automated rebuild
|
||||
|
||||
* Mon Jan 7 2002 Tim Waugh <twaugh@redhat.com> 1.48-1
|
||||
- 1.48.
|
||||
|
||||
* Sat Dec 8 2001 Tim Waugh <twaugh@redhat.com> 1.47-2
|
||||
- Conflict with PassiveTeX before 1.11.
|
||||
|
||||
* Tue Oct 16 2001 Tim Waugh <twaugh@redhat.com> 1.47-1
|
||||
- 1.47-experimental.
|
||||
|
||||
* Tue Oct 9 2001 Tim Waugh <twaugh@redhat.com> 1.45-2
|
||||
- Fix unversioned symlink.
|
||||
|
||||
* Mon Oct 8 2001 Tim Waugh <twaugh@redhat.com> 1.45-1
|
||||
- XML Catalog entries.
|
||||
- Move files to /usr/share/xml.
|
||||
|
||||
* Mon Oct 1 2001 Tim Waugh <twaugh@redhat.com> 1.45-0.1
|
||||
- 1.45.
|
||||
- Built for Red Hat Linux.
|
||||
|
||||
* Tue Jun 26 2001 Chris Runge <crunge@pobox.com>
|
||||
- 1.40
|
||||
|
||||
* Fri Jun 09 2001 Chris Runge <crunge@pobox.com>
|
||||
- added extensions and additional doc
|
||||
- bin added to doc; the Perl files are for Win32 Perl and so need some
|
||||
conversion first
|
||||
|
||||
* Fri Jun 08 2001 Chris Runge <crunge@pobox.com>
|
||||
- Initial RPM (based on docbook-style-dsssl RPM)
|
||||
- note: no catalog right now (I don't know how to do it; and not sure why
|
||||
it is necessary)
|
Loading…
Reference in new issue