Added normalization to object.title.markup.textonly mode, reverted

copyright link template in html/chunk-common.xsl to use it, and
updated a couple of places in manpages that should have already
been using it instead of object.title.markup.

diff --git a/xsl/common/gentext.xsl b/xsl/common/gentext.xsl
index 7b318a0f479bb1280ff31bf15083fcbe039f903a..975c427ca3356aa1a45365f3bd25ec0b46299349 100644 (file)
--- a/xsl/common/gentext.xsl
+++ b/xsl/common/gentext.xsl
@@ -284,7 +284,7 @@
   <xsl:variable name="title">
     <xsl:apply-templates select="." mode="object.title.markup"/>
   </xsl:variable>
-  <xsl:value-of select="$title"/>
+  <xsl:value-of select="normalize-space($title)"/>
 </xsl:template>
 
 <!-- ============================================================ -->

diff --git a/xsl/html/chunk-common.xsl b/xsl/html/chunk-common.xsl
index 31c2acdfb28546b7e3673950d030d73bef64b030..df772edae562ce44fbf429b9afb3dfdaad47529a 100644 (file)
--- a/xsl/html/chunk-common.xsl
+++ b/xsl/html/chunk-common.xsl
@@ -1174,11 +1174,9 @@
       <xsl:attribute name="href">
         <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
       </xsl:attribute>
-      <xsl:variable name="contents">
-        <xsl:apply-templates select="(//legalnotice)[1]" mode="object.title.markup.textonly"/>
-      </xsl:variable>
       <xsl:attribute name="title">
-        <xsl:value-of select="normalize-space($contents)"/>
+        <xsl:apply-templates select="(//legalnotice)[1]"
+                             mode="object.title.markup.textonly"/>
       </xsl:attribute>
     </link>
     <xsl:call-template name="make.legalnotice.head.links">

diff --git a/xsl/manpages/block.xsl b/xsl/manpages/block.xsl
index f607c99238108669658a579f0b97bd9167c3fc85..a52076ca47907bdfd0689d3d996858416c7571c0 100644 (file)
--- a/xsl/manpages/block.xsl
+++ b/xsl/manpages/block.xsl
@@ -211,7 +211,7 @@
 <xsl:template name="formal.object.heading">
   <xsl:param name="object" select="."/>
   <xsl:param name="title">
-    <bold><xsl:apply-templates select="$object" mode="object.title.markup"/></bold>
+    <bold><xsl:apply-templates select="$object" mode="object.title.markup.textonly"/></bold>
   </xsl:param>
   <xsl:apply-templates mode="bold" select="exsl:node-set($title)"/>
 </xsl:template>

diff --git a/xsl/manpages/table.xsl b/xsl/manpages/table.xsl
index 2e8ad2085c8ae15d5e6fa1fff30f5dd4bbfe23d1..9e77ff53941e20094c591a95dc3b62d01b6bfc79 100644 (file)
--- a/xsl/manpages/table.xsl
+++ b/xsl/manpages/table.xsl
@@ -43,7 +43,7 @@
     <xsl:param name="source"/>
     <xsl:param name="title">
       <xsl:if test="local-name(.) = 'table'">
-        <xsl:apply-templates select="." mode="object.title.markup"/>
+        <xsl:apply-templates select="." mode="object.title.markup.textonly"/>
       </xsl:if>
     </xsl:param>
     <!-- * ============================================================== -->