Opps, seems that I forgot to commit changes previously

diff --git a/xsl/highlighting/common.xsl b/xsl/highlighting/common.xsl
index 552c7c3731fb1c13ea742511728f4b95de1f1a77..753a21b48e605b7cc2fe025a75b4f0f77f4c43ad 100644 (file)
--- a/xsl/highlighting/common.xsl
+++ b/xsl/highlighting/common.xsl
@@ -18,9 +18,16 @@
 <!-- You can override this template to do more complex mapping of\r
      language attribute to highlighter language ID (see xslthl-config.xml) -->\r
 <xsl:template name="language.to.xslthl">\r
-  <xsl:param name="language"/>\r
+  <xsl:param name="context"/>\r
 \r
-  <xsl:value-of select="$language"/>\r
+  <xsl:choose>\r
+    <xsl:when test="$context/@language != ''">\r
+      <xsl:value-of select="$context/@language"/>\r
+    </xsl:when>\r
+    <xsl:when test="$highlight.default.language != ''">\r
+      <xsl:value-of select="$highlight.default.language"/>\r
+    </xsl:when>\r
+  </xsl:choose>\r
 </xsl:template>\r
 \r
 <xsl:template name="apply-highlighting">\r
@@ -28,16 +35,9 @@
     <!-- Do we want syntax highlighting -->\r
     <xsl:when test="$highlight.source != 0 and function-available('hl:highlight')">\r
       <xsl:variable name="language">\r
-       <xsl:choose>\r
-         <xsl:when test="@language">\r
-           <xsl:call-template name="language.to.xslthl">\r
-             <xsl:with-param name="language" select="@language"/>\r
-           </xsl:call-template>\r
-         </xsl:when>\r
-         <xsl:when test="$highlight.default.language != ''">\r
-           <xsl:value-of select="$highlight.default.language"/>\r
-         </xsl:when>\r
-       </xsl:choose>\r
+       <xsl:call-template name="language.to.xslthl">\r
+         <xsl:with-param name="context" select="."/>\r
+       </xsl:call-template>\r
       </xsl:variable>\r
       <xsl:choose>\r
        <xsl:when test="$language != ''">\r