rebuilt with Fedora patches and recipe [release 1.79.2-3mamba;Sat May 15 2021]

This commit is contained in:
Silvan Calarco 2024-01-05 21:51:50 +01:00
parent f6e70fbda5
commit 278529c3ef
11 changed files with 1062 additions and 133 deletions

View File

@ -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>

View File

@ -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"/>

View File

@ -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>

View File

@ -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() &lt; $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>&lt;</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>&lt;/</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>

View File

@ -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">

View File

@ -1,19 +1,24 @@
--- docbook-xsl-1.79.2/lib/lib.xsl.orig 2016-12-09 23:41:39.000000000 +0100 Description: use EXSLT "replace" function when available
+++ docbook-xsl-1.79.2/lib/lib.xsl 2018-05-09 13:50:28.378383717 +0200 A recursive implementation of string.subst is problematic,
@@ -6,7 +6,11 @@ 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 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" version="1.0">
+ ******************************************************************** --> + ******************************************************************** --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:str="http://exslt.org/strings" + xmlns:str="http://exslt.org/strings"
+ exclude-result-prefixes="str" + exclude-result-prefixes="str"
+ version="1.0"> + version="1.0">
<xsl:template name="dot.count"> <xsl:template name="dot.count">
<!-- Returns the number of "." characters in a string --> <!-- Returns the number of "." characters in a string -->
@@ -52,6 +56,9 @@ @@ -56,6 +59,9 @@
<xsl:param name="replacement"/> <xsl:param name="replacement"/>
<xsl:choose> <xsl:choose>

View File

@ -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>

View File

@ -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>

View File

@ -3,37 +3,50 @@ DESTDIR = ..overridden in spec file..
all: install all: install
install: install-xsl install-img install-extensions install-misc install: install-xsl install-img install-extensions install-misc install-epub
install-xsl: install-xsl:
mkdir -p $(DESTDIR)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling} 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/*.dtd $(DESTDIR)/common
cp common/*.ent $(DESTDIR)/common
cp common/*.xml $(DESTDIR)/common cp common/*.xml $(DESTDIR)/common
cp common/*.xsl $(DESTDIR)/common cp common/*.xsl $(DESTDIR)/common
cp eclipse/*.xsl $(DESTDIR)/eclipse
cp fo/*.xml $(DESTDIR)/fo cp fo/*.xml $(DESTDIR)/fo
cp fo/*.xsl $(DESTDIR)/fo cp fo/*.xsl $(DESTDIR)/fo
cp html/*.xml $(DESTDIR)/html cp html/*.xml $(DESTDIR)/html
cp html/*.xsl $(DESTDIR)/html cp html/*.xsl $(DESTDIR)/html
cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp
cp javahelp/*.xsl $(DESTDIR)/javahelp cp javahelp/*.xsl $(DESTDIR)/javahelp
cp lib/lib.xsl $(DESTDIR)/lib cp lib/*.xsl $(DESTDIR)/lib
cp template/README $(DESTDIR)/template
cp template/*.xml $(DESTDIR)/template
cp template/*.xsl $(DESTDIR)/template cp template/*.xsl $(DESTDIR)/template
cp xhtml/*.xsl $(DESTDIR)/xhtml cp xhtml/*.xsl $(DESTDIR)/xhtml
cp manpages/README $(DESTDIR)/manpages cp xhtml-1_1/*.xsl $(DESTDIR)/xhtml-1_1
cp manpages/*.xsl $(DESTDIR)/manpages cp manpages/*.xsl $(DESTDIR)/manpages
cp profiling/*.xsl $(DESTDIR)/profiling 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: install-img:
mkdir -p $(DESTDIR)/images/callouts mkdir -p $(DESTDIR)/images/callouts
cp images/*.gif $(DESTDIR)/images cp images/*.gif $(DESTDIR)/images
cp images/*.png $(DESTDIR)/images cp images/*.png $(DESTDIR)/images
cp images/*.svg $(DESTDIR)/images
cp images/callouts/*.png $(DESTDIR)/images/callouts cp images/callouts/*.png $(DESTDIR)/images/callouts
cp images/callouts/*.gif $(DESTDIR)/images/callouts
cp images/callouts/*.svg $(DESTDIR)/images/callouts
install-extensions: install-extensions:
mkdir -p $(DESTDIR)/extensions mkdir -p $(DESTDIR)/extensions
cp -r extensions/* $(DESTDIR)/extensions cp -r extensions/* $(DESTDIR)/extensions
install-epub:
mkdir -p $(DESTDIR)/epub
cp -r epub/* ${DESTDIR}/epub
install-misc: install-misc:
cp VERSION $(DESTDIR) cp VERSION $(DESTDIR)

View File

@ -1,73 +0,0 @@
--- docbook-xsl-1.64.1/fo/pagesetup.xsl.marginleft 2003-12-17 00:57:36.000000000 +0000
+++ docbook-xsl-1.64.1/fo/pagesetup.xsl 2004-01-18 16:29:32.000000000 +0000
@@ -34,29 +34,11 @@
margin-left="{$page.margin.outer} - {$title.margin.left}"
-->
<xsl:param name="margin.left.outer">
- <xsl:choose>
- <xsl:when test="$passivetex.extensions != 0">
- <xsl:value-of select="$page.margin.outer"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$page.margin.outer"/>
- <xsl:text> - </xsl:text>
- <xsl:value-of select="$title.margin.left"/>
- </xsl:otherwise>
- </xsl:choose>
+ <xsl:value-of select="$page.margin.outer"/>
</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">
--- docbook-xsl-1.64.1/fo/lists.xsl.marginleft 2003-12-04 20:13:46.000000000 +0000
+++ docbook-xsl-1.64.1/fo/lists.xsl 2004-01-18 16:31:51.000000000 +0000
@@ -303,7 +303,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="$termlength.is.number = 'NaN'">
@@ -312,7 +312,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>
@@ -321,7 +321,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>
@@ -348,8 +348,7 @@
|processing-instruction()[not(preceding-sibling::varlistentry)]"/>
<fo:list-block id="{$id}"
- provisional-distance-between-starts=
- "{$termlength}+{$label-separation}"
+ provisional-distance-between-starts="{$termlength}"
provisional-label-separation="{$label-separation}"
xsl:use-attribute-sets="list.block.spacing">
<xsl:apply-templates mode="vl.as.list"

View File

@ -1,41 +1,81 @@
Name: docbook-xsl Name: docbook-xsl
Version: 1.79.2 Version: 1.79.2
Release: 2mamba Release: 3mamba
Summary: Norman Walsh's XSL stylesheets for DocBook XML Summary: Norman Walsh's XSL stylesheets for DocBook XML
Group: Applications/Publishing Group: Applications/Publishing
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://docbook.sourceforge.net/projects/xsl URL: https://github.com/docbook/xslt10-stylesheets
Source0: https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F%{version}/docbook-xsl-%{version}.tar.bz2 Source0: https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F%{version}/docbook-xsl-nons-%{version}.tar.bz2
Source1: %{name}.Makefile Source1: docbook-xsl-Makefile
Source2: https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F%{version}/docbook-xsl-nons-%{version}.tar.bz2 Source2: https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F{%version}/docbook-xsl-doc-%{version}.tar.bz2
Patch0: docbook-xsl-marginleft.patch Patch0: docbook-xsl-1.79.2-marginleft.patch
Patch1: docbook-xsl-listblock.patch Patch1: docbook-xsl-listblock.patch
Patch2: docbook-xsl-1.79.2-samba-4.8.1.patch Patch2: docbook-xsl-1.79.2-non-recursive-string-subst.patch
Patch3: docbook-xsl-1.79.2-pagesetup.patch
Patch4: docbook-xsl-1.79.2-newmethods.patch
Patch5: docbook-xsl-1.79.2-non-constant-expression.patch
Patch6: docbook-xsl-1.79.2-xsl-list-item-body.patch
Patch7: docbook-xsl-1.79.2-mandir.patch
Patch8: docbook-xsl-1.79.2-fix-gtk-doc-multilib.patch
License: Distributable License: Distributable
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
Requires(pre): libxml2-utils Requires(post): libxml2-utils
Requires(postun): libxml2-utils
Requires: docbook-dtds >= 1.0 Requires: docbook-dtds >= 1.0
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %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. 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 %prep
%setup -q -a2 %setup -q -n docbook-xsl-nons-%{version} -a2
#%patch0 -p1 -b .marginleft mv docbook-xsl-%{version}/doc .
#%patch1 -p1 -b .listblock
#cp %{SOURCE1} Makefile %patch0 -p1 -b .marginleft
%patch2 -p1 ##%patch1 -p2 -b .listblock
%patch2 -p2
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
cp %{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 %build
%install %install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
DESTDIR=%{buildroot}
make install \
BINDIR=%{buildroot}%{_bindir} \
DESTDIR=%{buildroot}%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}
cp -a VERSION.xsl %{buildroot}%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}/VERSION.xsl
ln -s xsl-stylesheets-%{version} \
%{buildroot}%{_datadir}/sgml/docbook/xsl-stylesheets
# Don't ship the extensions (bug #177256).
rm -rf %{buildroot}%{_datadir}/sgml/docbook/xsl-stylesheets/extensions/*
:<< __OLD
install -d %{buildroot}%{_datadir}/sgml/docbook/xsl-stylesheets-%{version} install -d %{buildroot}%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}
for d in common docsrc eclipse epub extensions fo highlighting html \ for d in common docsrc eclipse epub extensions fo highlighting html \
htmlhelp images javahelp lib manpages params profiling roundtrip \ htmlhelp images javahelp lib manpages params profiling roundtrip \
@ -65,61 +105,49 @@ ln -s xsl-stylesheets-ns-%{version} %{buildroot}%{_datadir}/sgml/docbook/xsl-sty
%post %post
if [ $1 -ge 1 ]; then if [ $1 -ge 1 ]; then
#new install or upgrade CATALOG=%{_sysconfdir}/xml/catalog
CATALOG=/etc/xml/catalog
[ -e $CATALOG ] || /usr/bin/xmlcatalog --noout --create $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \ %{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/%{version}" \ "http://cdn.docbook.org/release/xsl-nons/%{version}" \
"file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \ %{_bindir}/xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/%{version}" \ "http://cdn.docbook.org/release/xsl-nons/%{version}" \
"file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG "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" \ %{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl/current" \ "http://docbook.sourceforge.net/release/xsl/current" \
"file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \ %{_bindir}/xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl/current" \ "http://docbook.sourceforge.net/release/xsl/current" \
"file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl-ns/%{version}" \
"file:///usr/share/sgml/docbook/xsl-stylesheets-ns-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl-ns/%{version}" \
"file:///usr/share/sgml/docbook/xsl-stylesheets-ns-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
"http://docbook.sourceforge.net/release/xsl-ns/current" \
"file:///usr/share/sgml/docbook/xsl-stylesheets-ns-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
"http://docbook.sourceforge.net/release/xsl-ns/current" \
"file:///usr/share/sgml/docbook/xsl-stylesheets-ns-%{version}" $CATALOG
fi fi
exit 0 :
%postun %postun
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
#erase CATALOG=%{_sysconfdir}/xml/catalog
CATALOG=/etc/xml/catalog
%{_bindir}/xmlcatalog --noout --del \ %{_bindir}/xmlcatalog --noout --del \
"file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
%{_bindir}/xmlcatalog --noout --del \
"file:///usr/share/sgml/docbook/xsl-stylesheets-ns-%{version}" $CATALOG
fi fi
exit 0 :
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/sgml/docbook/xsl-stylesheets %{_datadir}/sgml/docbook/xsl-stylesheets
%dir %{_datadir}/sgml/docbook/xsl-stylesheets-%{version} %dir %{_datadir}/sgml/docbook/xsl-stylesheets-%{version}
%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}/* %{_datadir}/sgml/docbook/xsl-stylesheets-%{version}/*
%{_datadir}/sgml/docbook/xsl-stylesheets-ns
%dir %{_datadir}/sgml/docbook/xsl-stylesheets-ns-%{version}
%{_datadir}/sgml/docbook/xsl-stylesheets-ns-%{version}/*
%doc COPYING %doc COPYING
#%doc BUGS README RELEASE-NOTES.* TODO doc docsrc #%doc BUGS README RELEASE-NOTES.* TODO doc docsrc
%changelog %changelog
* Sat May 15 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.79.2-3mamba
- rebuilt with Fedora patches and recipe
* Wed May 09 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 1.79.2-2mamba * Wed May 09 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 1.79.2-2mamba
- patch lib.xsl to fix samba 4.8.0 build (https://forums.funtoo.org/topic/1257-samba-installation-fails-due-to-manpage/) - patch lib.xsl to fix samba 4.8.0 build (https://forums.funtoo.org/topic/1257-samba-installation-fails-due-to-manpage/)