From: Mauritz Jeanson <mj@johanneberg.com>
Date: Tue, 14 Aug 2007 15:59:17 +0000 (+0000)
Subject: Updated support for SVG (must be a child of imagedata in DB 5).
X-Git-Tag: release/1.79.1~6^2~1798
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43b47a80654f38c58fd37dba0eae9bdbf443a680;p=docbook-dsssl

Updated support for SVG (must be a child of imagedata in DB 5).
Added support for MathML in imagedata.
---

diff --git a/xsl/html/graphics.xsl b/xsl/html/graphics.xsl
index bdf9c2048..497e2fb9a 100644
--- a/xsl/html/graphics.xsl
+++ b/xsl/html/graphics.xsl
@@ -1138,15 +1138,7 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
 </xsl:template>
 
 <xsl:template match="imageobject">
-  <xsl:choose>
-    <xsl:when xmlns:svg="http://www.w3.org/2000/svg"
-              test="svg:*">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="imagedata"/>
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:apply-templates select="imagedata"/>
 </xsl:template>
 
 <xsl:template match="imagedata">
@@ -1157,6 +1149,15 @@ valign: <xsl:value-of select="@valign"/></xsl:message>
   </xsl:variable>
 
   <xsl:choose>
+    <!-- Handle MathML and SVG markup in imagedata -->
+    <xsl:when test="mml:*" xmlns:mml="http://www.w3.org/1998/Math/MathML">
+      <xsl:apply-templates/>
+    </xsl:when>
+    
+    <xsl:when test="svg:*" xmlns:svg="http://www.w3.org/2000/svg">
+      <xsl:apply-templates/>
+    </xsl:when>
+
     <xsl:when test="@format='linespecific'">
       <xsl:choose>
         <xsl:when test="$use.extensions != '0'