From: Norman Walsh <ndw@nwalsh.com>
Date: Sat, 21 Jul 2001 14:32:31 +0000 (+0000)
Subject: Fix title-end punctuation problems on formalparas
X-Git-Tag: release/1.79.1~6^2~6371
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc9909c4e1378045361c5d1f62f5952635a3e405;p=docbook-dsssl

Fix title-end punctuation problems on formalparas
---

diff --git a/xsl/fo/block.xsl b/xsl/fo/block.xsl
index 589fab45f..2417c83ce 100644
--- a/xsl/fo/block.xsl
+++ b/xsl/fo/block.xsl
@@ -42,10 +42,22 @@
 </xsl:template>
 
 <xsl:template match="formalpara/title">
+  <xsl:variable name="titleStr" select="."/>
+  <xsl:variable name="lastChar">
+    <xsl:if test="$titleStr != ''">
+      <xsl:value-of select="substring($titleStr,string-length($titleStr),1)"/>
+    </xsl:if>
+  </xsl:variable>
+
   <fo:inline font-weight="bold"
              keep-with-next.within-line="always"
              padding-end="1em">
     <xsl:apply-templates/>
+    <xsl:if test="$lastChar != ''
+                  and not(contains($runinhead.title.end.punct, $lastChar))">
+      <xsl:value-of select="$runinhead.default.title.end.punct"/>
+    </xsl:if>
+    <xsl:text>&#160;</xsl:text>
   </fo:inline>
 </xsl:template>
 
diff --git a/xsl/fo/param.xsl b/xsl/fo/param.xsl
index e66c2f35a..9e85993f0 100644
--- a/xsl/fo/param.xsl
+++ b/xsl/fo/param.xsl
@@ -1241,5 +1241,27 @@ Otherwise, nested fo:blocks will be used.
 </refdescription>
 </doc:param>
 
+<!-- ==================================================================== -->
+<xsl:param name="runinhead.title.end.punct" select="'.!?:'" doc:type='string'/>
+
+<doc:param name="runinhead.title.end.punct" xmlns="">
+<refpurpose>Characters that count as punctuation on a run-in-head</refpurpose>
+<refdescription>
+<para>FIXME:
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="runinhead.default.title.end.punct" select="'.'" doc:type='string'/>
+
+<doc:param name="runinhead.default.title.end.punct" xmlns="">
+<refpurpose>Default punctuation character on a run-in-head</refpurpose>
+<refdescription>
+<para>FIXME:
+</para>
+</refdescription>
+</doc:param>
+
 </xsl:stylesheet>
 
diff --git a/xsl/html/block.xsl b/xsl/html/block.xsl
index ae6097be9..815ac868b 100644
--- a/xsl/html/block.xsl
+++ b/xsl/html/block.xsl
@@ -66,8 +66,21 @@
 </xsl:template>
 
 <xsl:template match="formalpara/title">
-  <b><xsl:apply-templates/></b>
-  <xsl:call-template name="gentext.space"/>
+  <xsl:variable name="titleStr" select="."/>
+  <xsl:variable name="lastChar">
+    <xsl:if test="$titleStr != ''">
+      <xsl:value-of select="substring($titleStr,string-length($titleStr),1)"/>
+    </xsl:if>
+  </xsl:variable>
+
+  <b>
+    <xsl:apply-templates/>
+    <xsl:if test="$lastChar != ''
+                  and not(contains($runinhead.title.end.punct, $lastChar))">
+      <xsl:value-of select="$runinhead.default.title.end.punct"/>
+    </xsl:if>
+    <xsl:text>&#160;</xsl:text>
+  </b>
 </xsl:template>
 
 <xsl:template match="formalpara/para">
diff --git a/xsl/html/param.xsl b/xsl/html/param.xsl
index 12627c3ef..8378033f8 100644
--- a/xsl/html/param.xsl
+++ b/xsl/html/param.xsl
@@ -1188,4 +1188,26 @@ will be passed through to the HTML as a class attribute on a
 </refdescription>
 </doc:param>
 
+<!-- ==================================================================== -->
+<xsl:param name="runinhead.title.end.punct" select="'.!?:'" doc:type='string'/>
+
+<doc:param name="runinhead.title.end.punct" xmlns="">
+<refpurpose>Characters that count as punctuation on a run-in-head</refpurpose>
+<refdescription>
+<para>FIXME:
+</para>
+</refdescription>
+</doc:param>
+
+<!-- ==================================================================== -->
+<xsl:param name="runinhead.default.title.end.punct" select="'.'" doc:type='string'/>
+
+<doc:param name="runinhead.default.title.end.punct" xmlns="">
+<refpurpose>Default punctuation character on a run-in-head</refpurpose>
+<refdescription>
+<para>FIXME:
+</para>
+</refdescription>
+</doc:param>
+
 </xsl:stylesheet>