Removed all "Do not edit this file" admonitions that get output in

generated stylesheets; such admonitions have in the past been
judged by the free-software police to be at-risk of
interpretation as license restrictions.
Also, made various updates to work around some funkiness is
xsltproc output.

diff --git a/xsl/common/entities.ent b/xsl/common/entities.ent
index eae584b9ee43563f8ba8b1775ccf03586202f0b5..7331a40963f94393d05ffbcbb2709cce01a6970a 100644 (file)
--- a/xsl/common/entities.ent
+++ b/xsl/common/entities.ent
@@ -21,37 +21,12 @@
 <!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'>
 
 
-<!ENTITY section   '(ancestor-or-self::set
-                     |ancestor-or-self::book
-                     |ancestor-or-self::part
-                     |ancestor-or-self::reference
-                     |ancestor-or-self::partintro
-                     |ancestor-or-self::chapter
-                     |ancestor-or-self::appendix
-                     |ancestor-or-self::preface
-                     |ancestor-or-self::article
-                     |ancestor-or-self::section
-                     |ancestor-or-self::sect1
-                     |ancestor-or-self::sect2
-                     |ancestor-or-self::sect3
-                     |ancestor-or-self::sect4
-                     |ancestor-or-self::sect5
-                     |ancestor-or-self::refentry
-                     |ancestor-or-self::refsect1
-                     |ancestor-or-self::refsect2
-                     |ancestor-or-self::refsect3
-                     |ancestor-or-self::simplesect
-                     |ancestor-or-self::bibliography
-                     |ancestor-or-self::glossary
-                     |ancestor-or-self::index
-                     |ancestor-or-self::webpage)[last()]'>
+<!ENTITY section   '(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]'>
 
 <!ENTITY section.id 'generate-id(&section;)'>
 <!ENTITY sep '" "'>
 
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())
-                and ($role = @role or $type = @type or
-                (string-length($role) = 0 and string-length($type) = 0))'>
+<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'>
 
 <!ENTITY setup-language-variable '
 <xsl:variable name="language" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

diff --git a/xsl/fo/param.xweb b/xsl/fo/param.xweb
index 53c64d3f33e734aa7938880a736b6f5ccc0ebdf9..791159e98d043229d75b859bdf17d05fb6564fe9 100644 (file)
--- a/xsl/fo/param.xweb
+++ b/xsl/fo/param.xweb
@@ -538,7 +538,7 @@ around all these parameters.</para>
                 exclude-result-prefixes="src"
                 version='1.0'>
 
-<!-- This file is generated from param.xweb; do not edit this file! -->
+<!-- This file is generated from param.xweb -->
 
 <!-- ********************************************************************
      $Id$

diff --git a/xsl/html/autoidx-kimber.xsl b/xsl/html/autoidx-kimber.xsl
index 20c977dbb5717a7337643ca78cc71daff94d65fc..6e7362ad072cbec93391e0e6ce732d725aeefaad 100644 (file)
--- a/xsl/html/autoidx-kimber.xsl
+++ b/xsl/html/autoidx-kimber.xsl
@@ -9,9 +9,7 @@
 <!-- Only one of these should be present in the entity -->
 <!ENTITY lang 'concat(/*/@lang, /*/@xml:lang)'>
 
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())
-                and ($role = @role or $type = @type or
-                (string-length($role) = 0 and string-length($type) = 0))'>
+<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'>
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService"
@@ -87,10 +85,7 @@
   </xsl:variable>
 
   <xsl:variable name="terms"
-                select="//indexterm[count(.|key('k-group',
-                   k:getIndexGroupKey(&lang;, &primary;))
-                   [&scope;][1]) = 1
-                   and not(@class = 'endofrange')]"/>
+                select="//indexterm[count(.|key('k-group', k:getIndexGroupKey(&lang;, &primary;))[&scope;][1]) = 1 and not(@class = 'endofrange')]"/>
 
   <xsl:variable name="alphabetical"
                 select="$terms[not(starts-with(
@@ -150,8 +145,7 @@
   <xsl:variable name="label"
           select="k:getIndexGroupLabel(&lang;, $key)"/>
 
-  <xsl:if test="key('k-group', $label)[&scope;]
-                [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
+  <xsl:if test="key('k-group', $label)[&scope;][count(.|key('primary', &primary;)[&scope;][1]) = 1]">
     <div class="indexdiv">
       <h3>
         <xsl:value-of select="$label"/>

diff --git a/xsl/html/autoidx-kosek.xsl b/xsl/html/autoidx-kosek.xsl
index db959fe3c27a77bc526b6d097eb6f9d4d79e367e..920fefc9149c1d542f64f1cea7220798c0386eb6 100644 (file)
--- a/xsl/html/autoidx-kosek.xsl
+++ b/xsl/html/autoidx-kosek.xsl
@@ -5,9 +5,7 @@
 <!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'>
 <!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'>
 
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())
-                and ($role = @role or $type = @type or
-                (string-length($role) = 0 and string-length($type) = 0))'>
+<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'>
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:i="urn:cz-kosek:functions:index"
@@ -82,10 +80,7 @@
   </xsl:variable>
 
   <xsl:variable name="terms"
-                select="//indexterm[count(.|key('group-code',
-                                          i:group-index(&primary;))
-                                          [&scope;][1]) = 1
-                                    and not(@class = 'endofrange')]"/>
+                select="//indexterm[count(.|key('group-code', i:group-index(&primary;))[&scope;][1]) = 1 and not(@class = 'endofrange')]"/>
 
   <div class="index">
     <xsl:apply-templates select="$terms" mode="index-div-kosek">
@@ -109,15 +104,13 @@
     <xsl:call-template name="l10n.language"/>
   </xsl:variable>
 
-  <xsl:if test="key('group-code', $key)[&scope;]
-                [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
+  <xsl:if test="key('group-code', $key)[&scope;][count(.|key('primary', &primary;)[&scope;][1]) = 1]">
     <div class="indexdiv">
       <h3>
         <xsl:value-of select="i:group-letter($key)"/>
       </h3>
       <dl>
-        <xsl:apply-templates select="key('group-code', $key)[&scope;]
-                                     [count(.|key('primary', &primary;)[&scope;][1])=1]"
+        <xsl:apply-templates select="key('group-code', $key)[&scope;][count(.|key('primary', &primary;)[&scope;][1])=1]"
                              mode="index-primary">
           <xsl:sort select="&primary;" lang="{$lang}"/>
           <xsl:with-param name="scope" select="$scope"/>

diff --git a/xsl/html/biblio-iso690.xsl b/xsl/html/biblio-iso690.xsl
index ea1a4fdcaa199e99214dc6b97ac43196f6f6ecb5..3a9a455dbe78226b7c0bbdd43642a4bce7c520cf 100644 (file)
--- a/xsl/html/biblio-iso690.xsl
+++ b/xsl/html/biblio-iso690.xsl
@@ -113,7 +113,7 @@
   <xsl:call-template name="iso690.edition">
     <xsl:with-param name="after" select="./bibliomisc[@role='issuing']"/>
   </xsl:call-template>
-  <!-- Issue designation (date and/or n°) [nonEL] -->
+  <!-- Issue designation (date and/or num) [nonEL] -->
   <xsl:if test="not(./bibliomisc[@role='medium'])">
     <xsl:call-template name="iso690.issuing"/>
   </xsl:if>
@@ -590,7 +590,7 @@
   </xsl:call-template>
 </xsl:template>
 
-<!-- Issue designation (date and/or n°) -->
+<!-- Issue designation (date and/or num) -->
 <xsl:template name="iso690.issuing">
   <xsl:param name="issuing.div">
     <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template>

diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index 0e508250911ba449adf4c855177674dc78fc3b94..4edecd137f77a3b515112fb482fa6f208d7f688a 100644 (file)
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -1,16 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE xsl:stylesheet [
-  <!ENTITY comment.block.parents "parent::answer|parent::appendix|parent::article|parent::bibliodiv|
-                                  parent::bibliography|parent::blockquote|parent::caution|parent::chapter|
-                                  parent::glossary|parent::glossdiv|parent::important|parent::index|
-                                  parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|
-                                  parent::partintro|parent::preface|parent::procedure|parent::qandadiv|
-                                  parent::qandaset|parent::question|parent::refentry|parent::refnamediv|
-                                  parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|
-                                  parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|
-                                  parent::sect5|parent::section|parent::setindex|parent::sidebar|
-                                  parent::simplesect|parent::taskprerequisites|parent::taskrelated|
-                                  parent::tasksummary|parent::warning">
+  <!ENTITY comment.block.parents "parent::answer|parent::appendix|parent::article|parent::bibliodiv|parent::bibliography|parent::blockquote|parent::caution|parent::chapter|parent::glossary|parent::glossdiv|parent::important|parent::index|parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|parent::partintro|parent::preface|parent::procedure|parent::qandadiv|parent::qandaset|parent::question|parent::refentry|parent::refnamediv|parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|parent::sect5|parent::section|parent::setindex|parent::sidebar|parent::simplesect|parent::taskprerequisites|parent::taskrelated|parent::tasksummary|parent::warning">
 ]>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xlink='http://www.w3.org/1999/xlink'

diff --git a/xsl/html/param.xweb b/xsl/html/param.xweb
index 50efc7063078696b81395572c3da2b6a5af9036c..5cffdb4c182443a054bc09709644c32f1caf2236 100644 (file)
--- a/xsl/html/param.xweb
+++ b/xsl/html/param.xweb
@@ -433,7 +433,7 @@ around all these parameters.</para>
 
 <src:fragment id="top" mundane-result-prefixes="xsl">
 
-<!-- This file is generated from param.xweb; do not edit this file! -->
+<!-- This file is generated from param.xweb -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 exclude-result-prefixes="src"

diff --git a/xsl/manpages/param.xweb b/xsl/manpages/param.xweb
index 21f92d79532dfca9d210f7ab5ccf690fe691aa4f..40fdd8314d074a24dc01dd9555a613fcadd24ab3 100644 (file)
--- a/xsl/manpages/param.xweb
+++ b/xsl/manpages/param.xweb
@@ -128,7 +128,7 @@
                exclude-result-prefixes='src'
                version='1.0'>
 
-<!-- This file is generated from param.xweb; do not edit this file! -->
+<!-- This file is generated from param.xweb -->
 
 <!-- ********************************************************************
      $Id$

diff --git a/xsl/profiling/xsl2profile.xsl b/xsl/profiling/xsl2profile.xsl
index eea98c90a2ad9dbf49134cefd748dcc9b9adda95..a8e2eafcbd33fd64a28451b130c97a91bce7f653 100644 (file)
--- a/xsl/profiling/xsl2profile.xsl
+++ b/xsl/profiling/xsl2profile.xsl
@@ -14,13 +14,9 @@
 <xsl:preserve-space elements="*"/>
 
 <xsl:template match="/">
-  <xsl:text>&#10;</xsl:text>
   <xsl:comment>This file was created automatically by xsl2profile</xsl:comment>
-  <xsl:text>&#10;</xsl:text>
-  <xsl:comment>from the DocBook XSL stylesheets. Do not edit this file.</xsl:comment>
-  <xsl:text>&#10;</xsl:text>
+  <xsl:comment>from the DocBook XSL stylesheets.</xsl:comment>
   <xsl:apply-templates/>
-  <xsl:text>&#10;</xsl:text>
 </xsl:template>
 
 <!-- Make sure we override some templates and parameters appropriately for XHTML -->

diff --git a/xsl/roundtrip/param.xweb b/xsl/roundtrip/param.xweb
index 0daee334afb070e3c962a799a8e3f81ffa6cf572..bb3948d3d5c12c328ac39027e51fdb4cb78efaed 100644 (file)
--- a/xsl/roundtrip/param.xweb
+++ b/xsl/roundtrip/param.xweb
@@ -44,7 +44,7 @@
                exclude-result-prefixes='src'
                version='1.0'>
 
-<!-- This file is generated from param.xweb; do not edit this file! -->
+<!-- This file is generated from param.xweb -->
 
 <!-- ********************************************************************
      $Id$

diff --git a/xsl/roundtrip/wordml-blocks.xsl b/xsl/roundtrip/wordml-blocks.xsl
index 28e8acec84909b7082077e7d252522dc677176ef..3e261ac2cdc7bf7fa047aca8b4f9410a5bb9e221 100644 (file)
--- a/xsl/roundtrip/wordml-blocks.xsl
+++ b/xsl/roundtrip/wordml-blocks.xsl
@@ -2,12 +2,14 @@
 <axsl:stylesheet xmlns:axsl="http://www.w3.org/1999/XSL/Transform" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:st1="urn:schemas-microsoft-com:office:smarttags" version="1.0">
 <!--====================================-->
 <!--=                                  =-->
-<!--=   DO NOT EDIT THIS STYLESHEET    =-->
-<!--=                                  =-->
-<!--= This stylesheet is generated     =-->
+<!--= This stylesheet is GENERATED     =-->
 <!--= by makeSections.xsl and a        =-->
 <!--= mapping specification.           =-->
 <!--=                                  =-->
+<!--=   IF YOU EDIT THIS STYLESHEET    =-->
+<!--=   YOUR CHANGES WILL GET          =-->
+<!--=   OVERWRITTEN!!                  =-->
+<!--=                                  =-->
 <!--= Revision history:                =-->
 <!--=  1.0 2005-11-08 SRB              =-->
 <!--=   Initial version.               =-->

diff --git a/xsl/roundtrip/wordml-sections.xsl b/xsl/roundtrip/wordml-sections.xsl
index 82bb2133462f74c01d82b556e6180a8b3908281c..d9945d1692803a7b946a4ea84f341041d4c3d60a 100644 (file)
--- a/xsl/roundtrip/wordml-sections.xsl
+++ b/xsl/roundtrip/wordml-sections.xsl
@@ -2,12 +2,14 @@
 <axsl:stylesheet xmlns:axsl="http://www.w3.org/1999/XSL/Transform" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:st1="urn:schemas-microsoft-com:office:smarttags" version="1.0">
 <!--====================================-->
 <!--=                                  =-->
-<!--=   DO NOT EDIT THIS STYLESHEET    =-->
-<!--=                                  =-->
 <!--= This stylesheet is generated     =-->
 <!--= by makeSections.xsl and a        =-->
 <!--= mapping specification.           =-->
 <!--=                                  =-->
+<!--=   IF YOU EDIT THIS STYLESHEET    =-->
+<!--=   YOUR CHANGES WILL GET          =-->
+<!--=   OVERWRITTEN!!                  =-->
+<!--=                                  =-->
 <!--= Revision history:                =-->
 <!--=  1.2 2005-10-03 SRB              =-->
 <!--=   Change XML Namespace URI.      =-->

diff --git a/xsl/slides/fo/param.xweb b/xsl/slides/fo/param.xweb
index 4cb46d40d89a361e7f83b7abeb099e8fea10a952..6e3395923d17fc6e36d49d4a5aa1debd3b8437a3 100644 (file)
--- a/xsl/slides/fo/param.xweb
+++ b/xsl/slides/fo/param.xweb
@@ -78,7 +78,7 @@ around all these parameters.</para>
 
 <src:fragment id="top" mundane-result-prefixes="xsl">
 
-<!-- This file is generated from param.xweb; do not edit this file! -->
+<!-- This file is generated from param.xweb -->
 
 <xsl:stylesheet exclude-result-prefixes="src" version="1.0">
 

diff --git a/xsl/slides/html/param.xweb b/xsl/slides/html/param.xweb
index d3bdaf5cf57612027458ee6c3875c8597af6be86..1334fe03dcd644de662bea1fad142c34597767b2 100644 (file)
--- a/xsl/slides/html/param.xweb
+++ b/xsl/slides/html/param.xweb
@@ -133,7 +133,7 @@ around all these parameters.</para>
 
 <src:fragment id="top" mundane-result-prefixes="xsl">
 
-<!-- This file is generated from param.xweb; do not edit this file! -->
+<!-- This file is generated from param.xweb -->
 
 <xsl:stylesheet exclude-result-prefixes="src" version="1.0">
 

diff --git a/xsl/template/titlepage.xsl b/xsl/template/titlepage.xsl
index 1c6648b99424dec8e18f964e4a72476e5bd30f8f..a461e3da7f074c37befff2b361d2bfe959a0bb0f 100644 (file)
--- a/xsl/template/titlepage.xsl
+++ b/xsl/template/titlepage.xsl
@@ -91,8 +91,7 @@ set of templates. This template creates an appropriate
     <xsl:text>&#xA;&#xA;</xsl:text>
     <xsl:comment>
       <xsl:text> This stylesheet was created by </xsl:text>
-      <xsl:text>template/titlepage.xsl; </xsl:text>
-      <xsl:text>do not edit it by hand. </xsl:text>
+      <xsl:text>template/titlepage.xsl</xsl:text>
     </xsl:comment>
 
     <xsl:if test="@t:base-stylesheet">

diff --git a/xsl/tools/xsl/build/fix-params-ns.xsl b/xsl/tools/xsl/build/fix-params-ns.xsl
index 8da96ec3042eb3cd3749b86e8f19f1014a6dc2a7..459e7395169e12e7d99604e002207003a5a41cf0 100644 (file)
--- a/xsl/tools/xsl/build/fix-params-ns.xsl
+++ b/xsl/tools/xsl/build/fix-params-ns.xsl
@@ -1,13 +1,16 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-               version='1.0'
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                exclude-result-prefixes="fo"
+  version='1.0'
+  xmlns:fo="http://www.w3.org/1999/XSL/Format"
+  xmlns:saxon="http://icl.com/saxon"
+  exclude-result-prefixes="fo"
 >
   <xsl:import href="./identity.xsl"/>
 
   <xsl:output method="xml"
-             indent="no"/>
-  
+  encoding="ASCII"
+  saxon:character-representation="decimal"
+  indent="no"/>
+
   <!-- copy all xsl:* elements but strip the extra namespaces nodes -->
   <xsl:template match="*[namespace-uri() = 'http://www.w3.org/1999/XSL/Transform']">
     <xsl:element name="{name()}">
@@ -15,7 +18,7 @@
       <xsl:apply-templates/>
     </xsl:element>
   </xsl:template>
-  
+
   <!-- copy all fo:* elements but strip the extra namespace nodes -->
   <xsl:template match="*[namespace-uri() = 'http://www.w3.org/1999/XSL/Format']">
     <xsl:element name="{name()}">

diff --git a/xsl/tools/xsl/build/make-elements.xsl b/xsl/tools/xsl/build/make-elements.xsl
index f440c41ac428c7977441fb053e45516c72a4c852..1031d014155bd312395321baf75b940b7f2eb345 100644 (file)
--- a/xsl/tools/xsl/build/make-elements.xsl
+++ b/xsl/tools/xsl/build/make-elements.xsl
@@ -25,11 +25,10 @@
   <xsl:template match="/">
     <xslt:stylesheet version="1.0">
       <xsl:text>&#xa;</xsl:text>
-      <xsl:comment> *           Do not edit this file. </xsl:comment>
       <xsl:text>&#xa;</xsl:text>
-      <xsl:comment> * It was generated automatically by the build. </xsl:comment>
+      <xsl:comment> * This stylesheet is automatically generated. </xsl:comment>
       <xsl:text>&#xa;</xsl:text>
-      <xsl:comment> * Edit the make-elements.xsl file instead. </xsl:comment>
+      <xsl:comment> * Edit the make-elements.xsl file to re-generate this. </xsl:comment>
       <xslt:variable name="docbook-element-list">
         <simplelist role="element"> 
           <xsl:for-each

diff --git a/xsl/tools/xsl/build/make-xsl-params.xsl b/xsl/tools/xsl/build/make-xsl-params.xsl
index dc6aa4c06cd648c973ea94789f1350d2ee5cf529..e605df176db1799022533f44d778ce53914168da 100644 (file)
--- a/xsl/tools/xsl/build/make-xsl-params.xsl
+++ b/xsl/tools/xsl/build/make-xsl-params.xsl
@@ -23,11 +23,10 @@
   <xsl:template match="/">
     <xslt:stylesheet version="1.0"> 
       <xsl:text>&#xa;</xsl:text>
-      <xsl:comment> *           Do not edit this file. </xsl:comment>
       <xsl:text>&#xa;</xsl:text>
-      <xsl:comment> * It was generated automatically by the build. </xsl:comment>
+      <xsl:comment> * This stylesheet was generated automatically. </xsl:comment>
       <xsl:text>&#xa;</xsl:text>
-      <xsl:comment> * Edit the make-xsl-params.xsl file instead. </xsl:comment>
+      <xsl:comment> * Edit the make-xsl-params.xsl file to rebuild this. </xsl:comment>
 
       <!-- * Process params for each output format listed in $param.dirs -->
       <!-- * by splitting the value of $param.dirs into two parts: the part -->

diff --git a/xsl/website/param.xweb b/xsl/website/param.xweb
index f15fbaa12488f4cbe2d6e7801c406592ad3332d0..4cd40671fe13afb7063a6cd92aaf21531214e00e 100644 (file)
--- a/xsl/website/param.xweb
+++ b/xsl/website/param.xweb
@@ -72,7 +72,7 @@ around all these parameters.</para>
 
 <src:fragment id="top" mundane-result-prefixes="xsl">
 
-<!-- This file is generated from param.xweb; do not edit this file! -->
+<!-- This file is generated from param.xweb -->
 
 <xsl:stylesheet exclude-result-prefixes="src" version="1.0">
 

diff --git a/xsl/xhtml/html2xhtml.xsl b/xsl/xhtml/html2xhtml.xsl
index e23e3c7f9557c1baae5b23e5b14a275e807e53f4..f9e32b61dbf355d410f9a872307ff8ced5fb4766 100644 (file)
--- a/xsl/xhtml/html2xhtml.xsl
+++ b/xsl/xhtml/html2xhtml.xsl
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:exsl="http://exslt.org/common"
+                xmlns:saxon="http://icl.com/saxon"
                 exclude-result-prefixes="exsl"
                 version="1.0">
 
 <xsl:include href="../lib/lib.xsl"/>
-<xsl:output method="xml" encoding="US-ASCII"/>
+<xsl:output method="xml"
+  encoding="ASCII"
+  saxon:character-representation="decimal"
+  />
 <xsl:preserve-space elements="*"/>
 
 <xsl:template match="/">
-  <xsl:text>&#10;</xsl:text>
   <xsl:comment>This file was created automatically by html2xhtml</xsl:comment>
-  <xsl:text>&#10;</xsl:text>
-  <xsl:comment>from the HTML stylesheets. Do not edit this file.</xsl:comment>
-  <xsl:text>&#10;</xsl:text>
+  <xsl:comment>from the HTML stylesheets.</xsl:comment>
   <xsl:apply-templates/>
-  <xsl:text>&#10;</xsl:text>
 </xsl:template>
 
 <xsl:template match="xsl:stylesheet" >