Added the html.append and chunk.append parameters. By default, the

value of both is empty; but the internal DocBook XSL stylesheets
build sets their value to "<xsl:text>&#x0a;</xsl:text>", in order
to ensure that all files in the docbook-xsl-doc package end in a
newline character. (Because diff and some other tools may emit
error messages and/or not behave as expected when processing
files that are not newline-terminated.)

diff --git a/xsl/html/chunk-common.xsl b/xsl/html/chunk-common.xsl
index df772edae562ce44fbf429b9afb3dfdaad47529a..719308cd9e2ca8aa061f0114cd379d1e0d2cf233 100644 (file)
--- a/xsl/html/chunk-common.xsl
+++ b/xsl/html/chunk-common.xsl
@@ -1241,6 +1241,7 @@
       <xsl:call-template name="user.footer.navigation"/>
     </body>
   </html>
+  <xsl:value-of select="$chunk.append"/>
 </xsl:template>
 
 </xsl:stylesheet>

diff --git a/xsl/html/docbook.xsl b/xsl/html/docbook.xsl
index 57dd13d18a346e0cef185773bbf11bfeff32849c..b4ad72109bd933e1401a0bfb355f6185234c2329 100644 (file)
--- a/xsl/html/docbook.xsl
+++ b/xsl/html/docbook.xsl
@@ -422,6 +422,7 @@ body { background-image: url('</xsl:text>
       </xsl:call-template>
     </body>
   </html>
+  <xsl:value-of select="$html.append"/>
 </xsl:template>
 
 <xsl:template name="root.messages">

diff --git a/xsl/html/graphics.xsl b/xsl/html/graphics.xsl
index a254a07e0500a601f29c47c59bf94e2ee9d07541..66cabde2aab1992d3ab3e4140ae0ed887fb5f610 100644 (file)
--- a/xsl/html/graphics.xsl
+++ b/xsl/html/graphics.xsl
@@ -1254,6 +1254,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
             </xsl:for-each>
           </body>
         </html>
+        <xsl:value-of select="$chunk.append"/>
       </xsl:with-param>
     </xsl:call-template>
   </xsl:if>

diff --git a/xsl/html/param.ent b/xsl/html/param.ent
index 7611a899ce59554d8c10b88581d054be444f1258..af7d0f5f8d49670acdbc81345bf7ceddc976c291 100644 (file)
--- a/xsl/html/param.ent
+++ b/xsl/html/param.ent
@@ -73,6 +73,7 @@
 <!ENTITY header.rule SYSTEM "../params/header.rule.xml">
 <!ENTITY highlight.default.language SYSTEM "../params/highlight.default.language.xml"> 
 <!ENTITY highlight.source SYSTEM "../params/highlight.source.xml"> 
+<!ENTITY html.append SYSTEM "../params/html.append.xml">
 <!ENTITY html.base SYSTEM "../params/html.base.xml">
 <!ENTITY html.cleanup SYSTEM "../params/html.cleanup.xml">
 <!ENTITY html.ext SYSTEM "../params/html.ext.xml">
@@ -252,6 +253,7 @@
 <!ENTITY menuchoice.menu.separator SYSTEM "../params/menuchoice.menu.separator.xml">
 <!ENTITY bibliography.numbered SYSTEM "../params/bibliography.numbered.xml">
 <!ENTITY chunk.tocs.and.lots SYSTEM "../params/chunk.tocs.and.lots.xml">
+<!ENTITY chunk.append SYSTEM "../params/chunk.append.xml">
 <!ENTITY chunk.tocs.and.lots.has.title SYSTEM "../params/chunk.tocs.and.lots.has.title.xml">
 <!ENTITY graphicsize.extension SYSTEM "../params/graphicsize.extension.xml">
 <!ENTITY graphicsize.use.img.src.path SYSTEM "../params/graphicsize.use.img.src.path.xml">

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index eadfc0c72361a06939b32699e28f00a055a329bc..379d93bed41f266d8f075963adade0a2f0901869 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -150,6 +150,7 @@ stylesheet like this:</para>
 &html.longdesc.link;
 &make.valid.html;
 &html.cleanup;
+&html.append;
 &draft.mode;
 &draft.watermark.image;
 &generate.id.attributes;
@@ -343,6 +344,7 @@ stylesheet like this:</para>
 &chunk.section.depth;
 &chunk.first.sections;
 &chunk.quietly;
+&chunk.append;
 &navig.graphics;
 &navig.graphics.extension;
 &navig.graphics.path;
@@ -493,6 +495,7 @@ around all these parameters.</para>
 <src:fragref linkend="callout.unicode.start.character.frag"/>
 <src:fragref linkend="callouts.extension.frag"/>
 <src:fragref linkend="chapter.autolabel.frag"/>
+<src:fragref linkend="chunk.append.frag"/>
 <src:fragref linkend="chunk.first.sections.frag"/>
 <src:fragref linkend="chunk.quietly.frag"/>
 <src:fragref linkend="chunk.section.depth.frag"/>
@@ -551,6 +554,7 @@ around all these parameters.</para>
 <src:fragref linkend="header.rule.frag"/>
 <src:fragref linkend="highlight.default.language.frag"/>
 <src:fragref linkend="highlight.source.frag"/>
+<src:fragref linkend="html.append.frag"/>
 <src:fragref linkend="html.base.frag"/>
 <src:fragref linkend="html.cellpadding.frag"/>
 <src:fragref linkend="html.cellspacing.frag"/>
@@ -623,6 +627,7 @@ around all these parameters.</para>
 <src:fragref linkend="index.prefer.titleabbrev.frag"/>
 <src:fragref linkend="ignore.image.scaling.frag"/>
 <src:fragref linkend="inherit.keywords.frag"/>
+<src:fragref linkend="insert.xref.page.number.frag"/>
 <src:fragref linkend="keep.relative.image.uris.frag"/>
 <src:fragref linkend="l10n.gentext.default.language.frag"/>
 <src:fragref linkend="l10n.gentext.language.frag"/>
@@ -750,7 +755,6 @@ around all these parameters.</para>
 <src:fragref linkend="xref.label-title.separator.frag"/>
 <src:fragref linkend="xref.label-page.separator.frag"/>
 <src:fragref linkend="xref.title-page.separator.frag"/>
-<src:fragref linkend="insert.xref.page.number.frag"/>
 
 </xsl:stylesheet>
 </src:fragment>

diff --git a/xsl/html/titlepage.xsl b/xsl/html/titlepage.xsl
index 062303f34c6bc2d101b5f0e194430c9a8cdf8fa8..b17029e5cd0d08459347e4028bd5eb6aa3202bb8 100644 (file)
--- a/xsl/html/titlepage.xsl
+++ b/xsl/html/titlepage.xsl
@@ -522,6 +522,7 @@
               </div>
             </body>
           </html>
+          <xsl:value-of select="$chunk.append"/>
         </xsl:with-param>
       </xsl:call-template>
     </xsl:when>
@@ -749,6 +750,7 @@
               <xsl:copy-of select="$contents"/>
             </body>
           </html>
+          <xsl:text>&#x0a;</xsl:text>
         </xsl:with-param>
       </xsl:call-template>
     </xsl:when>

diff --git a/xsl/params/chunk.append.xml b/xsl/params/chunk.append.xml
new file mode 100644 (file)
index 0000000..11b2b3e
--- /dev/null
+++ b/xsl/params/chunk.append.xml
@@ -0,0 +1,27 @@
+<refentry xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
+          xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          id="chunk.append">
+<refmeta>
+<refentrytitle>chunk.append</refentrytitle>
+
+</refmeta>
+<refnamediv>
+<refname>chunk.append</refname>
+<refpurpose>Specifies content to append to chunked HTML output</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='chunk.append.frag'><xsl:param name="chunk.append"/></src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>Specifies content to append to the end of HTML files output by
+the <filename>html/chunk.xsl</filename> stylesheet, after the closing
+<code>&lt;html></code> tag. You probably don’t want to set any value
+for this parameter; but if you do, the only value it should ever be
+set to is a newline character: <code>&amp;#x0a;</code> or
+<code>&amp;#10;</code></para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/params/html.append.xml b/xsl/params/html.append.xml
new file mode 100644 (file)
index 0000000..2e6ea43
--- /dev/null
+++ b/xsl/params/html.append.xml
@@ -0,0 +1,27 @@
+<refentry xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
+          xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+          id="html.append">
+<refmeta>
+<refentrytitle>html.append</refentrytitle>
+
+</refmeta>
+<refnamediv>
+<refname>html.append</refname>
+<refpurpose>Specifies content to append to HTML output</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+<src:fragment id='html.append.frag'><xsl:param name="html.append"/></src:fragment>
+</refsynopsisdiv>
+
+<refsect1><title>Description</title>
+
+<para>Specifies content to append to the end of HTML files output by
+the <filename>html/docbook.xsl</filename> stylesheet, after the
+closing <code>&lt;html></code> tag. You probably don’t want to set any
+value for this parameter; but if you do, the only value it should ever
+be set to is a newline character: <code>&amp;#x0a;</code> or
+<code>&amp;#10;</code></para>
+
+</refsect1>
+</refentry>

diff --git a/xsl/template/titlepage.xsl b/xsl/template/titlepage.xsl
index 728ff99d843cc9299de8c52f99bdbb66ba8b5f10..8869a618236ceea98e670a9078d2a47f727ec011 100644 (file)
--- a/xsl/template/titlepage.xsl
+++ b/xsl/template/titlepage.xsl
@@ -20,6 +20,12 @@
 
 <!-- ==================================================================== -->
 
+<xsl:template match="/">
+  <xsl:text>&#x0a;</xsl:text>
+  <xsl:apply-templates/>
+  <xsl:text>&#x0a;</xsl:text>
+</xsl:template>
+
 <doc:reference xmlns="">
 <referenceinfo>
 <releaseinfo role="meta">

diff --git a/xsl/tools/xsl/build/clrefentry.xsl b/xsl/tools/xsl/build/clrefentry.xsl
index a21e6cdfe65aafd11258b68d04b551400c496e42..77e124cd84ee954f2e098b1fcec4f9b381b8255e 100644 (file)
--- a/xsl/tools/xsl/build/clrefentry.xsl
+++ b/xsl/tools/xsl/build/clrefentry.xsl
@@ -9,6 +9,7 @@
 
 <xsl:param name="use.id.as.filename" select="1"/>
 <xsl:param name="refentry.separator" select="0"/>
+<xsl:param name="chunk.append"><xsl:text>&#x0a;</xsl:text></xsl:param>
 
 <!-- n.b. reference pages are one directory down, so we point back up -->
 <xsl:param name="html.stylesheet" select="'../css/reference.css'"/>

diff --git a/xsl/tools/xsl/build/doc-link-docbook.xsl b/xsl/tools/xsl/build/doc-link-docbook.xsl
index f16b7b4d8569493fb5ac62353f430e3a86c64a32..d7e72f57478b1c28a12b40ad154724a28821b0b3 100644 (file)
--- a/xsl/tools/xsl/build/doc-link-docbook.xsl
+++ b/xsl/tools/xsl/build/doc-link-docbook.xsl
@@ -5,5 +5,6 @@
 <xsl:import href="../../../html/docbook.xsl"/>
 <xsl:include href="tdg-link.xsl"/>
 <xsl:include href="xsl-param-link.xsl"/>
+<xsl:param name="html.append"><xsl:text>&#x0a;</xsl:text></xsl:param>
 
 </xsl:stylesheet>

diff --git a/xsl/tools/xsl/build/jrefhtml.xsl b/xsl/tools/xsl/build/jrefhtml.xsl
index c79f6e993960a9dd3fb836a6f6dcff6c7e576f83..af97477660c930cfa4e9d1d18b2eeada7d66ab0d 100644 (file)
--- a/xsl/tools/xsl/build/jrefhtml.xsl
+++ b/xsl/tools/xsl/build/jrefhtml.xsl
@@ -28,6 +28,7 @@
 <xsl:param name="admon.graphics.path">../images/</xsl:param>
 <xsl:param name="admon.graphics.extension" select="'.png'"></xsl:param>
 <xsl:param name="admon.style"/>
+<xsl:param name="html.append"><xsl:text>&#x0a;</xsl:text></xsl:param>
 
 
 <xsl:template match="refentry">

diff --git a/xsl/tools/xsl/build/reference.xsl b/xsl/tools/xsl/build/reference.xsl
index 30ad08d352b0b61b7ce37e0b22179f7f1a9f6c2a..05436a949e9ae784a951ee0e937de4816d3fde15 100644 (file)
--- a/xsl/tools/xsl/build/reference.xsl
+++ b/xsl/tools/xsl/build/reference.xsl
@@ -11,6 +11,7 @@
 <xsl:param name="admon.graphics.extension" select="'.png'"></xsl:param>
 <xsl:param name="admon.style"/>
 <xsl:param name="generate.toc"/>
+<xsl:param name="html.append"><xsl:text>&#x0a;</xsl:text></xsl:param>
 
 <xsl:template match="/legalnotice">
   <xsl:apply-templates select="." mode="titlepage.mode"/>