From 8c5bb84c2f752c82551763bf15b9b2a8371cff6f Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 24 Nov 2005 22:18:05 +0000
Subject: [PATCH] Reset default value to empty string so template uses gentext
 first, then the parameter value if not empty.

---
 xsl/params/index.number.separator.xml | 25 +++++++++++++----------
 xsl/params/index.range.separator.xml  | 29 +++++++++++++++------------
 xsl/params/index.term.separator.xml   | 22 ++++++++++----------
 3 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/xsl/params/index.number.separator.xml b/xsl/params/index.number.separator.xml
index 1e516b9a7..7780b6cb1 100644
--- a/xsl/params/index.number.separator.xml
+++ b/xsl/params/index.number.separator.xml
@@ -5,42 +5,45 @@
 </refmeta>
 <refnamediv>
 <refname>index.number.separator</refname>
-<refpurpose>Punctuation separating page numbers in index</refpurpose>
+<refpurpose>Override for punctuation separating page numbers in index</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <src:fragment id='index.number.separator.frag'>
-<xsl:param name="index.number.separator">
-  <xsl:call-template name="gentext.template">
-    <xsl:with-param name="context">index</xsl:with-param>
-    <xsl:with-param name="name">number-separator</xsl:with-param>
-  </xsl:call-template>
-</xsl:param>
+<xsl:param name="index.number.separator" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>This parameter contains the text to insert between
+<para>This parameter permits you to override the text to insert between
 page references in a formatted index entry.  Typically 
 that would be a comma and a space.
 </para>
 
 <para>Because this text may be locale dependent,
-this parameter's value is taken from a gentext
+this parameter's value is normally taken from a gentext
 template named 'number-separator' in the
 context 'index' in the stylesheet
 locale file for the language
 of the current document.
+This parameter can be used to override the gentext string,
+and would typically be used on the command line.
+This parameter would apply to all languages.
 </para>
 
 <para>So this text string can be customized in two ways.
-You can override the default gentext string using
+You can reset the default gentext string using
 the <parameter>local.l10n.xml</parameter> parameter, or you can
-directly replace the content of this parameter.
+override the gentext with the content of this parameter.
 The content can be a simple string, or it can be
 something more complex such as a call-template.
 </para>
 
+<para>In HTML index output, section title references are used instead of
+page number references.  This punctuation appears between
+such section titles in an HTML index.
+</para>
+
 </refsect1>
 </refentry>
diff --git a/xsl/params/index.range.separator.xml b/xsl/params/index.range.separator.xml
index 004cc1c3e..6d5bce526 100644
--- a/xsl/params/index.range.separator.xml
+++ b/xsl/params/index.range.separator.xml
@@ -5,45 +5,48 @@
 </refmeta>
 <refnamediv>
 <refname>index.range.separator</refname>
-<refpurpose>Punctuation separating the two numbers
+<refpurpose>Override for punctuation separating the two numbers
 in a page range in index</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <src:fragment id='index.range.separator.frag'>
-<xsl:param name="index.range.separator">
-  <xsl:call-template name="gentext.template">
-    <xsl:with-param name="context">index</xsl:with-param>
-    <xsl:with-param name="name">range-separator</xsl:with-param>
-  </xsl:call-template>
-</xsl:param>
+<xsl:param name="index.range.separator" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>This parameter contains the text to insert between
+<para>This parameter permits you
+to override the text to insert between
 the two numbers of a page range in an index.
 This parameter is only used by those XSL-FO processors
 that support an extension for generating such page ranges
-(such as XEP).
-</para>
+(such as XEP).</para>
 
 <para>Because this text may be locale dependent,
-this parameter's value is taken from a gentext
+this parameter's value is normally taken from a gentext
 template named 'range-separator' in the
 context 'index' in the stylesheet
 locale file for the language
 of the current document.
+This parameter can be used to override the gentext string,
+and would typically be used on the command line.
+This parameter would apply to all languages.
 </para>
 
 <para>So this text string can be customized in two ways.
-You can override the default gentext string using
+You can reset the default gentext string using
 the <parameter>local.l10n.xml</parameter> parameter, or you can
-directly replace the content of this parameter.
+override the gentext with the content of this parameter.
 The content can be a simple string, or it can be
 something more complex such as a call-template.
 </para>
 
+<para>In HTML index output, section title references are used instead of
+page number references. So there are no page ranges
+and this parameter has no effect.
+</para>
+
 </refsect1>
 </refentry>
diff --git a/xsl/params/index.term.separator.xml b/xsl/params/index.term.separator.xml
index cff276116..ed501241c 100644
--- a/xsl/params/index.term.separator.xml
+++ b/xsl/params/index.term.separator.xml
@@ -5,40 +5,40 @@
 </refmeta>
 <refnamediv>
 <refname>index.term.separator</refname>
-<refpurpose>Punctuation separating an index term 
+<refpurpose>Override for punctuation separating an index term 
 from its list of page references in an index</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <src:fragment id='index.term.separator.frag'>
-<xsl:param name="index.term.separator">
-  <xsl:call-template name="gentext.template">
-    <xsl:with-param name="context">index</xsl:with-param>
-    <xsl:with-param name="name">term-separator</xsl:with-param>
-  </xsl:call-template>
-</xsl:param>
+<xsl:param name="index.term.separator" select="''"/>
 </src:fragment>
 </refsynopsisdiv>
 
 <refsect1><title>Description</title>
 
-<para>This parameter contains the text to insert between
+<para>This parameter permits you to override
+the text to insert between
 the end of an index term and its list of page references.
 Typically that might be a comma and a space.
 </para>
 
 <para>Because this text may be locale dependent,
-this parameter's value is taken from a gentext
+this parameter's value is normally taken from a gentext
 template named 'term-separator' in the
 context 'index' in the stylesheet
 locale file for the language
 of the current document.
+This parameter can be used to override the gentext string,
+and would typically be used on the command line.
+This parameter would apply to all languages.
 </para>
 
 <para>So this text string can be customized in two ways.
-You can override the default gentext string using
+You can reset the default gentext string using
 the <parameter>local.l10n.xml</parameter> parameter, or you can
-directly replace the content of this parameter.
+fill in the content for this normally empty 
+override parameter.
 The content can be a simple string, or it can be
 something more complex such as a call-template.
 For fo output, it could be an <sgmltag>fo:leader</sgmltag>
-- 
2.40.0