diff options
Diffstat (limited to 'docutil')
| -rw-r--r-- | docutil/HTML_COPYRIGHT | 7 | ||||
| -rw-r--r-- | docutil/MAN_COPYRIGHT | 7 | ||||
| -rw-r--r-- | docutil/patch-db2latex-duplicate-template-bug | 75 | ||||
| -rw-r--r-- | docutil/patch-db2latex-nested-param-bug | 16 | ||||
| -rw-r--r-- | docutil/patch-db2latex-xsltproc-title-bug | 27 |
5 files changed, 132 insertions, 0 deletions
diff --git a/docutil/HTML_COPYRIGHT b/docutil/HTML_COPYRIGHT new file mode 100644 index 0000000..82c7e91 --- /dev/null +++ b/docutil/HTML_COPYRIGHT @@ -0,0 +1,7 @@ +<!-- + - Copyright (C) 1996-2016 Internet Systems Consortium, Inc. ("ISC") + - + - This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. +--> diff --git a/docutil/MAN_COPYRIGHT b/docutil/MAN_COPYRIGHT new file mode 100644 index 0000000..b00f6c3 --- /dev/null +++ b/docutil/MAN_COPYRIGHT @@ -0,0 +1,7 @@ +.\" +.\" Copyright (C) 1996-2016 Internet Systems Consortium, Inc. ("ISC") +.\" +.\" This Source Code Form is subject to the terms of the Mozilla Public +.\" License, v. 2.0. If a copy of the MPL was not distributed with this +.\" file, You can obtain one at http://mozilla.org/MPL/2.0/. +.\" diff --git a/docutil/patch-db2latex-duplicate-template-bug b/docutil/patch-db2latex-duplicate-template-bug new file mode 100644 index 0000000..c9354ae --- /dev/null +++ b/docutil/patch-db2latex-duplicate-template-bug @@ -0,0 +1,75 @@ +;; This is a patch to work around a known bug in db2latex. Apparently +;; xsltproc's error checking got a lot better since the authors of +;; db2latex last tested this, so a clear language violation that +;; xsltproc used to ignore now prevents xsltproc from working with +;; db2latex. +;; +;; On FreeBSD you can simply drop this patch into the directory +;; /usr/ports/textproc/db2latex/files/ and the ports system should +;; take it from there. I've sent this patch off to the port +;; maintainer but have not yet heard anything back. +;; +;; I don't really know whther this is the "right" fix, but it seems to +;; work, and I'm pretty sure that the code this patch deletes does not +;; work as it stands, so at worst the result after applying this patch +;; should be no worse than the result without this patch. +;; +;; YMMV. If this patch breaks, you get to keep both pieces. + +Index: xsl/qandaset.mod.xsl +--- xsl/qandaset.mod.xsl.~1~ Sun Jan 4 08:22:27 2004 ++++ xsl/qandaset.mod.xsl Fri Apr 1 22:30:20 2005 +@@ -363,53 +363,4 @@ + </doc:template> + <xsl:template match="revhistory" mode="qandatoc.mode"/> + +-<xsl:template name="question.answer.label"> +- <!-- variable: deflabel --> +- <xsl:variable name="deflabel"> +- <!-- chck whether someone has a defaultlabel attribute --> +- <xsl:choose> +- <xsl:when test="ancestor-or-self::*[@defaultlabel]"> +- <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]/@defaultlabel"/> +- </xsl:when> +- <xsl:otherwise> +- <xsl:value-of select="latex.qanda.defaultlabel"/> +- </xsl:otherwise> +- </xsl:choose> +- </xsl:variable> +- +- <xsl:variable name="label" select="@label"/> +- <xsl:choose> +- <xsl:when test="$deflabel = 'qanda'"> +- <xsl:call-template name="gentext"> +- <xsl:with-param name="key"> +- <xsl:choose> +- <xsl:when test="local-name(.) = 'question'">question</xsl:when> +- <xsl:when test="local-name(.) = 'answer'">answer</xsl:when> +- <xsl:when test="local-name(.) = 'qandadiv'">qandadiv</xsl:when> +- <xsl:otherwise>qandaset</xsl:otherwise> +- </xsl:choose> +- </xsl:with-param> +- </xsl:call-template> +- </xsl:when> +- <xsl:when test="$deflabel = 'label'"> +- <xsl:value-of select="$label"/> +- </xsl:when> +- <xsl:when test="$deflabel = 'number' and local-name(.) = 'question'"> +- <xsl:apply-templates select="ancestor::qandaset[1]" mode="number"/> +- <xsl:choose> +- <xsl:when test="ancestor::qandadiv"> +- <xsl:apply-templates select="ancestor::qandadiv[1]" mode="number"/> +- <xsl:apply-templates select="ancestor::qandaentry" mode="number"/> +- </xsl:when> +- <xsl:otherwise> +- <xsl:apply-templates select="ancestor::qandaentry" mode="number"/> +- </xsl:otherwise> +- </xsl:choose> +- </xsl:when> +- <xsl:otherwise> +- <!-- nothing --> +- </xsl:otherwise> +- </xsl:choose> +-</xsl:template> +- + </xsl:stylesheet> diff --git a/docutil/patch-db2latex-nested-param-bug b/docutil/patch-db2latex-nested-param-bug new file mode 100644 index 0000000..5facc0e --- /dev/null +++ b/docutil/patch-db2latex-nested-param-bug @@ -0,0 +1,16 @@ +;; Latest version of xsltproc doesn't like <xsl:param><xsl:param/></xsl:param>. + +--- xsl/lists.mod.xsl.~1~ Sat Jan 31 06:53:50 2004 ++++ xsl/lists.mod.xsl Tue Feb 6 15:41:12 2007 +@@ -269,10 +269,8 @@ + </doc:notes> + </doc:template> + <xsl:template match="varlistentry"> +- <xsl:param name="next.is.list"> + <xsl:param name="object" select="listitem/*[1]"/> +- <xsl:value-of select="count($object[self::itemizedlist or self::orderedlist or self::variablelist])"/> +- </xsl:param> ++ <xsl:param name="next.is.list" select="count($object[self::itemizedlist or self::orderedlist or self::variablelist])"/> + <xsl:variable name="id"> + <xsl:call-template name="label.id"/> + </xsl:variable> diff --git a/docutil/patch-db2latex-xsltproc-title-bug b/docutil/patch-db2latex-xsltproc-title-bug new file mode 100644 index 0000000..65a5ca7 --- /dev/null +++ b/docutil/patch-db2latex-xsltproc-title-bug @@ -0,0 +1,27 @@ +;; This patches around a problem that I don't completely understand, +;; and which may in fact be an xsltproc bug rather than a db2latex +;; bug. Symptom is that the generated \title{} contains not only the +;; book title but also the concatenation of all the chapter titles. +;; This makes no sense, it doesn't happen with saxon, it doesn't +;; happen with all versions of xsltproc, and attempts to trace this +;; with --verbose and <xsl:message/> leave me more wondering whether +;; it's me or xsltproc that doesn't understand the XSLT pattern +;; matching rules. +;; +;; All that said, the change below prevents the bad behavior and +;; should be completely harmless, so it will do as a workaround. + +Index: xsl/book-article.mod.xsl +--- xsl/book-article.mod.xsl.~1~ Tue May 3 21:51:18 2005 ++++ xsl/book-article.mod.xsl Sat May 7 09:00:26 2005 +@@ -87,8 +87,8 @@ + <xsl:call-template name="generate.latex.book.preamble"/> + <!-- book:2: output title information --> + <xsl:text>\title{</xsl:text> +- <xsl:apply-templates select="title|bookinfo/title"/> +- <xsl:apply-templates select="subtitle|bookinfo/subtitle"/> ++ <xsl:apply-templates select="/book/title|/book/bookinfo/title"/> ++ <xsl:apply-templates select="/book/subtitle|/book/bookinfo/subtitle"/> + <xsl:text>} </xsl:text> + <!-- book:3: output author information --> + <xsl:text>\author{</xsl:text> |