From ddc785197ebda5711a5c196fb6e7cfe35a9ec4dd Mon Sep 17 00:00:00 2001
From: Mauritz Jeanson <mj@johanneberg.com>
Date: Thu, 26 Jul 2007 21:42:04 +0000
Subject: [PATCH] Replaced <font> with <span> and/or inline styles. This fixes
 the problem with <span class="ERROR"> in XHTML (and <font> is deprecated
 anyway). Closes bug #1715774.

---
 xsl/html/docbook.xsl   |  4 ++--
 xsl/html/highlight.xsl | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/xsl/html/docbook.xsl b/xsl/html/docbook.xsl
index 8a170ab19..ee71c2b7d 100644
--- a/xsl/html/docbook.xsl
+++ b/xsl/html/docbook.xsl
@@ -98,7 +98,7 @@
     <xsl:text>, but no template matches.</xsl:text>
   </xsl:message>
 
-  <font color="red">
+  <span style="color: red">
     <xsl:text>&lt;</xsl:text>
     <xsl:value-of select="name(.)"/>
     <xsl:text>&gt;</xsl:text>
@@ -106,7 +106,7 @@
     <xsl:text>&lt;/</xsl:text>
     <xsl:value-of select="name(.)"/>
     <xsl:text>&gt;</xsl:text>
-  </font>
+  </span>
 </xsl:template>
 
 <xsl:template match="text()">
diff --git a/xsl/html/highlight.xsl b/xsl/html/highlight.xsl
index 598bc34b1..f6ece1777 100644
--- a/xsl/html/highlight.xsl
+++ b/xsl/html/highlight.xsl
@@ -19,37 +19,36 @@
 </xsl:template>
 
 <xsl:template match='xslthl:string'>
-  <b class="hl-string"><i><font color='red'><xsl:apply-templates/></font></i></b>
+  <b class="hl-string"><i style="color:red"><xsl:apply-templates/></i></b>
 </xsl:template>
 
 <xsl:template match='xslthl:comment'>
-  <i class="hl-comment"><font color='silver'><xsl:apply-templates/></font></i>
+  <i class="hl-comment" style="color: silver"><xsl:apply-templates/></i>
 </xsl:template>
 
 <xsl:template match='xslthl:tag'>
-  <b class="hl-tag"><font color='blue'><xsl:apply-templates/></font></b>
+  <b class="hl-tag" style="color: blue"><xsl:apply-templates/></b>
 </xsl:template>
 
 <xsl:template match='xslthl:attribute'>
-  <span class="hl-attribute"><font color='blue'><xsl:apply-templates/></font></span>
+  <span class="hl-attribute" style="color: blue"><xsl:apply-templates/></span>
 </xsl:template>
 
 <xsl:template match='xslthl:value'>
-  <span class="hl-value"><font color='blue'><xsl:apply-templates/></font></span>
+  <span class="hl-value" style="color: blue"><xsl:apply-templates/></span>
 </xsl:template>
 
 <xsl:template match='xslthl:html'>
-  <b><i><font color='red'><xsl:apply-templates/></font></i></b>
+  <b><i style="color: red"><xsl:apply-templates/></i></b>
 </xsl:template>
 
 <xsl:template match='xslthl:xslt'>
-  <b><font color='blue'><xsl:apply-templates/></font></b>
+  <b style="color: blue"><xsl:apply-templates/></b>
 </xsl:template>
 
 <xsl:template match='xslthl:section'>
   <b><xsl:apply-templates/></b>
 </xsl:template>
 
-
 </xsl:stylesheet>
 
-- 
2.50.1