From 1fb7e7af10a9ff616ad58426c46707dac3b0f05a Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 31 Aug 2016 05:45:32 +0000
Subject: [PATCH] Small bugfix for Foundry to avoid a warning about an
 ambiguous rule for Bebop labels.

git-svn-id: https://svn.libreccm.org/ccm/trunk@4237 8810af33-2d31-482b-a856-94f89814c4df
---
 .../foundry/foundry/lib/bebop/label.xsl       | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl b/ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl
index 711246bba..d0212699d 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE stylesheet [<!ENTITY nbsp '&#160;'>]>
 
-<!-- 
+<!--
     Copyright: 2006, 2007, 2008 Sören Bernstein
-  
+
     This file is part of Mandalay.
 
     Mandalay is free software: you can redistribute it and/or modify
@@ -27,17 +27,17 @@
   Processing bebop label
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
-                xmlns:cms="http://www.arsdigita.com/cms/1.0" 
-                xmlns:foundry="http://foundry.libreccm.org" 
+                xmlns:cms="http://www.arsdigita.com/cms/1.0"
+                xmlns:foundry="http://foundry.libreccm.org"
                 xmlns:nav="http://ccm.redhat.com/navigation"
                 exclude-result-prefixes="xsl bebop cms foundry nav"
                 version="2.0">
-  
+
     <!-- DE Ein Text-Label mit Formatierung -->
     <!-- EN A formatted text label -->
-    <xsl:template match="bebop:label[@color != '' or @weight != '' or @id != '' or @class != '']">
+    <xsl:template match="bebop:label[@color != '' or @weight != '' or @id != '' or (@class != '' and @class != 'heading')]">
         <xsl:call-template name="foundry:bebop-label-style">
             <xsl:with-param name="text">
                 <xsl:value-of select="."/>
@@ -56,7 +56,7 @@
 
     <!-- DE Ein Text-Label im Javascript-Mode und mit Formatierung -->
     <!-- EN A formatted, javascript-mode text label -->
-    <xsl:template match="bebop:label[@color != '' or @weight != '' or @id != '']" 
+    <xsl:template match="bebop:label[@color != '' or @weight != '' or @id != '']"
                   mode="javascript-mode">
         <xsl:call-template name="foundry:bebop-label-style">
             <xsl:with-param name="text">
@@ -76,7 +76,7 @@
             </xsl:with-param>
         </xsl:call-template>
     </xsl:template>
-  
+
     <!-- DE Ein Text-Label im Javascript-Mode -->
     <!-- EN A javascript-mode text label -->
     <xsl:template match="bebop:label" mode="javascript-mode">
@@ -89,7 +89,7 @@
             </xsl:with-param>
         </xsl:call-template>
     </xsl:template>
-  
+
     <!-- DE Ein vorformatiertes Text-Label -->
     <!-- EN A preformatted text label -->
     <xsl:template match="bebop:label[@class = 'preformatted']">
@@ -104,7 +104,7 @@
             </xsl:call-template>
         </pre>
     </xsl:template>
-  
+
     <!-- DE Ein Text-Label als Überschrift -->
     <!-- EN A text label for the heading -->
     <xsl:template match="bebop:label[@class = 'heading']">
@@ -119,7 +119,7 @@
             </xsl:call-template>
         </span>
     </xsl:template>
-  
+
     <!-- DE Ein Text-Label -->
     <!-- EN A text label -->
     <xsl:template match="bebop:label">
@@ -132,7 +132,7 @@
             </xsl:with-param>
         </xsl:call-template>
     </xsl:template>
- 
+
     <!-- DE Ein graphisches Label-->
     <!-- EN A graphical label -->
     <xsl:template match="bebop:label" mode="image">
@@ -141,7 +141,7 @@
         <xsl:param name="src"/>
         <img alt="{$alt}" title="{$title}" src="{$src}"/>
     </xsl:template>
- 
+
     <!-- DE Setze die Formatierung für das Label als style Attribut für ein span -->
     <!-- EN Set label formatting as style attribute for a span-->
     <xsl:template name="foundry:bebop-label-style">
@@ -150,7 +150,7 @@
         <xsl:param name="color"/>
         <xsl:param name="weight"/>
         <xsl:param name="mode"/>
-    
+
         <span>
             <xsl:call-template name="foundry:process-datatree-attributes"/>
             <xsl:if test="$escape = 'yes'">
@@ -205,13 +205,13 @@
             </xsl:choose>
         </span>
     </xsl:template>
-  
+
     <!-- DE Erzuege den Text des Labels javascript konform -->
     <!-- EN Processing the label text in a javascript compatible way -->
     <xsl:template name="foundry:bebop-label-textjs">
         <xsl:param name="text"/>
         <xsl:param name="escape">no</xsl:param>
-    
+
         <xsl:call-template name="foundry:bebop-label-text">
             <xsl:with-param name="text"
                             select="replace(current(), '&#x2019;', '&#x005C;&#x2019;')"/>
@@ -225,10 +225,10 @@
     <xsl:template name="foundry:bebop-label-text">
         <xsl:param name="text"/>
         <xsl:param name="escape">no</xsl:param>
-    
-        <!-- DE Keine leeren Labels ausgeben. Das original Theme wandelt diese in &#160; um. 
+
+        <!-- DE Keine leeren Labels ausgeben. Das original Theme wandelt diese in &#160; um.
         Das sollte nicht nötig sein -->
-        <!-- EN Don't print empty Labels. Originally they were converted to &#160; 
+        <!-- EN Don't print empty Labels. Originally they were converted to &#160;
         but that shouldn't be needed -->
         <xsl:if test="not(normalize-space($text)='')">
             <xsl:choose>
@@ -238,7 +238,7 @@
                 <xsl:otherwise>
                     <xsl:value-of disable-output-escaping="no" select="$text"/>
                 </xsl:otherwise>
-            </xsl:choose> 
+            </xsl:choose>
         </xsl:if>
 
         <!-- DE Hinweise anzeigen -->
@@ -252,5 +252,5 @@
             </span>
         </xsl:if>
     </xsl:template>
-    
+
 </xsl:stylesheet>