From b1cf78e059c2952e8a3ebbc4166574b5b4af23e1 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 8 Jun 2012 07:17:45 +0000
Subject: [PATCH] =?UTF-8?q?Nachziehen=20r1697=20aus=20release=202.0:=20Unt?=
 =?UTF-8?q?erst=C3=BCtzung=20f=C3=BCr=20Formeln=20in=20Xinha=20und=20Manda?=
 =?UTF-8?q?lay.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@1699 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js               | 2 +-
 .../web/themes/mandalay/includes/mandalay/layoutParser.xsl  | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js b/ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js
index 5ddb0a78d..32ceedbdf 100644
--- a/ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js
+++ b/ccm-cms/web/assets/xinha/CCMcmsXinhaConfig.js
@@ -13,7 +13,7 @@ xinha_init=xinha_init?xinha_init:function(){
 xinha_editors=xinha_editors?xinha_editors:["myTextArea","anotherOne"];
 xinha_plugins=xinha_plugins?xinha_plugins:["CharacterMap","CharCounter",
     "ContextMenu","DefinitionList","FindReplace","ListType","QuickTag",
-    "SmartReplace","Stylist","TableOperations","UnFormat"];
+    "SmartReplace","Stylist","TableOperations","UnFormat","Equation"];
 if(!Xinha.loadPlugins(xinha_plugins,xinha_init)){
 return;
 }
diff --git a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
index c85c5faf6..9ab559c4c 100755
--- a/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/includes/mandalay/layoutParser.xsl
@@ -52,6 +52,7 @@
         <xsl:value-of select="$lang"/>
       </xsl:attribute>
       <xsl:apply-templates/>
+      <script type="text/javascript" src="/assets/xinha/plugins/Equation/ASCIIMathML.js"></script>
     </html>
   </xsl:template>
 
@@ -76,7 +77,7 @@
     </xsl:variable>
     <xsl:variable name="colorClass">
       <xsl:if test="@withColorset='true'">
-        <xsl:call-template name="mandalay:getColorset"/>
+        <xsl:call-template name="mandalay:getColorset"/>       
       </xsl:if>
     </xsl:variable>
     
@@ -179,9 +180,6 @@
     </title>
   </xsl:template>
 
-  <xsl:template match="useImageGallery">
-    <xsl:call-template name="mandalay:imageGallery"/>
-  </xsl:template>
 
   <!-- ************************************************************************************************************ -->
   <!-- ************************************************************************************************************ -->