Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docbook-xsl rebuild

Browse Source
This commit is contained in:
Rmys
2022-09-14 13:01:50 +03:00
parent adac4cea6e
commit b536a1cb30
10 changed files with 159 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/docbook/docbook-xsl/files/feodra/docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch
+74
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>
office/docbook/docbook-xsl/files/nonrecursive-string-subst.patch → office/docbook/docbook-xsl/files/feodra/docbook-style-xsl-non-recursive-string-subst.patch
+5 -5
View File
@@ -4,14 +4,14 @@ Description: use EXSLT "replace" function when available
Author: Peter De Wachter <pdewacht@gmail.com>
Bug-Debian: https://bugs.debian.org/750593
--- a/lib/lib.xsl
+++ b/lib/lib.xsl
--- 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"
- ******************************************************************** --><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">
office/docbook/docbook-xsl/files/docbook-xsl-list-item-body.patch → office/docbook/docbook-xsl/files/feodra/docbook-xsl-list-item-body.patch
View File
office/docbook/docbook-xsl/files/docbook-xsl-mandir.patch → office/docbook/docbook-xsl/files/feodra/docbook-xsl-mandir.patch
+3 -3
View File
@@ -14,6 +14,6 @@ diff -urNp docbook-xsl-1.76.1-orig/manpages/other.xsl docbook-xsl-1.76.1/manpage
+ <xsl:value-of select="'.so '"/> <!-- added case -->
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:call-template name="make.adjusted.man.filename">
<xsl:with-param name="name" select="$first.refname"/>
<xsl:with-param name="section" select="$section"/>
<xsl:variable name="full.filename">
<xsl:call-template name="make.adjusted.man.filename">
<xsl:with-param name="name" select="$first.refname"/>
office/docbook/docbook-xsl/files/feodra/docbook-xsl-marginleft.patch
+53
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>
office/docbook/docbook-xsl/files/docbook-xsl-newmethods.patch → office/docbook/docbook-xsl/files/feodra/docbook-xsl-newmethods.patch
+3 -3
View File
@@ -385,10 +385,10 @@ diff -urNp docbook-xsl-1.76.0-orig/html/param.xsl docbook-xsl-1.76.0/html/param.
--- 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://docbook.sourceforge.net/release/images/annot-close.png</xsl:param>
<xsl:param name="annotation.graphic.open">http://docbook.sourceforge.net/release/images/annot-open.png</xsl:param>
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://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js</xsl:text></xsl:param>
<xsl:text>http://cdn.docbook.org/release/xsl/script/AnchorPosition.js http://cdn.docbook.org/release/xsl/script/PopupWindow.js</xsl:text></xsl:param>
office/docbook/docbook-xsl/files/docbook-xsl-non-constant-expressions.patch → office/docbook/docbook-xsl/files/feodra/docbook-xsl-non-constant-expressions.patch
View File
office/docbook/docbook-xsl/files/docbook-xsl-pagesetup.patch → office/docbook/docbook-xsl/files/feodra/docbook-xsl-pagesetup.patch
View File
office/docbook/docbook-xsl/pspec.xml
+21 -18
View File
@@ -1,12 +1,10 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>docbook-xsl</Name>
<Homepage>https://docbook.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Packager>
<License>BSD</License>
<IsA>data</IsA>
@@ -17,30 +15,35 @@
<AdditionalFile target="Makefile">Makefile</AdditionalFile>
</AdditionalFiles>
<Patches>
<Patch level="1">docbook-xsl-pagesetup.patch</Patch>
<!-- <Patch level="1">docbook-xsl-newmethods.patch</Patch> -->
<Patch level="1">docbook-xsl-non-constant-expressions.patch</Patch>
<!-- <Patch level="1">docbook-xsl-list-item-body.patch</Patch> -->
<!-- <Patch level="1">nonrecursive-string-subst.patch</Patch> -->
<!-- <Patch level="1">docbook-xsl-mandir.patch</Patch> -->
<Patch level="1">feodra/docbook-style-xsl-1.79.2-fix-gtk-doc-multilib.patch</Patch>
<Patch level="1">feodra/docbook-xsl-list-item-body.patch</Patch>
<Patch level="1">feodra/docbook-xsl-mandir.patch</Patch>
<Patch level="1">feodra/docbook-xsl-marginleft.patch</Patch>
<Patch level="1">feodra/docbook-xsl-newmethods.patch</Patch>
<Patch level="1">feodra/docbook-xsl-non-constant-expressions.patch</Patch>
<Patch level="1">feodra/docbook-xsl-pagesetup.patch</Patch>
<Patch>feodra/docbook-style-xsl-non-recursive-string-subst.patch</Patch>
</Patches>
</Source>
<Package>
<Name>docbook-xsl</Name>
<RuntimeDependencies>
<Dependency>docbook-xml</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc/docbook-xsl</Path>
<Path fileType="data">/usr/share/xml</Path>
</Files>
<Provides>
<COMAR script="package.py">System.Package</COMAR>
</Provides>
<Summary>Norman Walsh's XSL stylesheets for DocBook XML</Summary>
<RuntimeDependencies>
<Dependency>docbook-xml</Dependency>
</RuntimeDependencies>
</Package>
<History>
<Update release="9">
<Date>2022-09-14</Date>
<Version>1.79.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Date>2022-05-31</Date>
<Version>1.79.2</Version>
office/docbook/docbook-xsl/translations.xml
-1
View File
@@ -1,4 +1,3 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>docbook-xsl</Name>