[yelp-xsl] [mallard/html] A few missed updates for the common HTML output

[Shaun McCance <shaunm src gnome org>]

commit 942ead7831463bbaeb22cdc2bbf165052a5b9716
Author: Shaun McCance <shaunm gnome org>
Date:   Tue Jun 8 10:17:10 2010 -0500

    [mallard/html] A few missed updates for the common HTML output

 xslt/mallard/html/mal2html-svg.xsl |   12 ++++++------
 xslt/mallard/html/mal2xhtml.xsl    |    1 -
 2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/xslt/mallard/html/mal2html-svg.xsl b/xslt/mallard/html/mal2html-svg.xsl
index 26f5213..e6bf856 100644
--- a/xslt/mallard/html/mal2html-svg.xsl
+++ b/xslt/mallard/html/mal2html-svg.xsl
@@ -96,7 +96,12 @@ certain Mallard extensions, for example to use the Mallard linking mechanism.
     </xsl:choose>
   </xsl:variable>
   <xsl:choose>
-    <xsl:when test="$mal2html.namespace = ''">
+    <xsl:when test="$html.xhtml">
+      <div class="svg">
+        <xsl:apply-templates mode="mal2html.svg.mode" select="."/>
+      </div>
+    </xsl:when>
+    <xsl:otherwise>
       <div class="svg">
         <object data="{$id}.svg" type="image/svg+xml">
           <xsl:copy-of select="@width"/>
@@ -106,11 +111,6 @@ certain Mallard extensions, for example to use the Mallard linking mechanism.
       <exsl:document href="{$id}.svg">
         <xsl:apply-templates mode="mal2html.svg.mode" select="."/>
       </exsl:document>
-    </xsl:when>
-    <xsl:otherwise>
-      <div class="svg">
-        <xsl:apply-templates mode="mal2html.svg.mode" select="."/>
-      </div>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
diff --git a/xslt/mallard/html/mal2xhtml.xsl b/xslt/mallard/html/mal2xhtml.xsl
index 8311264..b15404d 100644
--- a/xslt/mallard/html/mal2xhtml.xsl
+++ b/xslt/mallard/html/mal2xhtml.xsl
@@ -40,7 +40,6 @@ REMARK: Describe this module
 <xsl:param name="mal.link.extension" select="$html.extension"/>
 
 <xsl:include href="mal2html-block.xsl"/>
-<xsl:include href="mal2html-css.xsl"/>
 <xsl:include href="mal2html-inline.xsl"/>
 <xsl:include href="mal2html-list.xsl"/>
 <xsl:include href="mal2html-media.xsl"/>