From: Norman Walsh <ndw@nwalsh.com>
Date: Sat, 21 Apr 2001 14:36:41 +0000 (+0000)
Subject: Improve processing of trademarks
X-Git-Tag: release/1.79.1~6^2~6569
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7fad91a8ff2581131a5463a413caa94163625964;p=docbook-dsssl

Improve processing of trademarks
---

diff --git a/xsl/html/inline.xsl b/xsl/html/inline.xsl
index f64024be6..6e825ada4 100644
--- a/xsl/html/inline.xsl
+++ b/xsl/html/inline.xsl
@@ -456,11 +456,22 @@
 
 <xsl:template match="trademark">
   <xsl:call-template name="inline.charseq"/>
-  <xsl:if test="@class">
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat" select="@class"/>
-    </xsl:call-template>
-  </xsl:if>
+  <xsl:choose>
+    <xsl:when test="@class = 'copyright'
+                    or @class = 'registered'">
+      <xsl:call-template name="dingbat">
+        <xsl:with-param name="dingbat" select="@class"/>
+      </xsl:call-template>
+    </xsl:when>
+    <xsl:when test="@class = 'service'">
+      <sup>SM</sup>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="dingbat">
+        <xsl:with-param name="dingbat" select="'trademark'"/>
+      </xsl:call-template>
+    </xsl:otherwise>
+  </xsl:choose>
 </xsl:template>
 
 <xsl:template match="firstterm">