From 17bde8c7aca1c597b653ae362d25bf5aad0a0d48 Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Mon, 13 Jun 2005 07:25:40 +0000
Subject: [PATCH] Trademark symbol handling made consistent with handling of
 same in HTML stylesheets. (closes #1218286; thanks to Mauritz Jeanson for
 reporting the problem)

Prior to this change, if you processed a doc that contained no
value for the Class attribute on the Trademark element, the HTML
stylesheets would default to rendering a superscript TM symbol
after the Trademark contents, but the FO stylesheets would render
nothing. This change alters the FO handing of Trademark such that
it is now identical to the HTML handling.
---
 xsl/fo/inline.xsl | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/xsl/fo/inline.xsl b/xsl/fo/inline.xsl
index 3ed22a93c..ed118afea 100644
--- a/xsl/fo/inline.xsl
+++ b/xsl/fo/inline.xsl
@@ -645,11 +645,24 @@
 
 <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'">
+      <xsl:call-template name="inline.superscriptseq">
+        <xsl:with-param name="content" select="'SM'"/>
+      </xsl:call-template>
+    </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">
-- 
2.40.0