X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2FDEVEL%2Fmathml_editor%2Fxsl%2Ftml-mmlp.xsl;h=9054b9c997ffbaf020b6378f819c373384ed3fbd;hb=7bea7bddf7ca13260f4d3965182dc4fb58d035e7;hp=69de8c52e38531b7d96f4bd4b48946b620530066;hpb=6bb809fdd7a94a55031dbb50f5510539aae13b28;p=helm.git

diff --git a/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl b/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl
index 69de8c52e..9054b9c99 100644
--- a/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl
+++ b/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl
@@ -68,7 +68,7 @@
     </m:mo>
   </xsl:template>
 
-  <xsl:template match="tml:cursor">
+  <xsl:template name="cursor">
     <xsl:choose>
       <xsl:when test="substring(@val,1,1)='\'">
         <m:mrow>
@@ -84,13 +84,30 @@
       </xsl:when>
       <xsl:otherwise>
         <m:mtext mathcolor="blue">
-          <xsl:if test="@id">
-            <xsl:attribute name="xref">
-              <xsl:value-of select="@id"/>
-            </xsl:attribute>
-          </xsl:if>
-	  <xsl:value-of select="@val"/>
-	</m:mtext>
+         <xsl:if test="@id">
+           <xsl:attribute name="xref">
+             <xsl:value-of select="@id"/>
+           </xsl:attribute>
+         </xsl:if>
+	 I
+	 </m:mtext>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="tml:cursor">
+    <xsl:param name="annotation" select="/.."/>
+    <xsl:choose>
+      <xsl:when test="$annotation">
+        <m:msub>
+	  <xsl:call-template name="cursor"/>
+	  <m:mtext>
+	    <xsl:value-of select="$annotation"/>
+	  </m:mtext>
+	</m:msub>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="cursor"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -196,9 +213,12 @@
   </xsl:template>
 
   <xsl:template match="tml:g">
+    <xsl:param name="annotation" select="/.."/>
     <xsl:choose>
       <xsl:when test="not(@id) and count(*) = 1">
-        <xsl:apply-templates select="*[1]"/>
+        <xsl:apply-templates select="*[1]">
+	  <xsl:with-param name="annotation" select="$annotation"/>
+	</xsl:apply-templates>
       </xsl:when>
       <xsl:when test="tml:cursor">
     	<m:mstyle mathbackground="#e0e0e0">
@@ -208,7 +228,9 @@
             </xsl:attribute>
 	  </xsl:if>
 	  <m:mrow>
-    	    <xsl:apply-templates select="*"/>
+    	    <xsl:apply-templates select="*">
+	      <xsl:with-param name="annotation" select="$annotation"/>
+	    </xsl:apply-templates>
 	  </m:mrow>
     	</m:mstyle>
       </xsl:when>
@@ -219,7 +241,9 @@
               <xsl:value-of select="@id"/>
             </xsl:attribute>
 	  </xsl:if>
-    	  <xsl:apply-templates select="*"/>
+    	  <xsl:apply-templates select="*">
+	    <xsl:with-param name="annotation" select="$annotation"/>
+	  </xsl:apply-templates>
     	</m:mrow>
       </xsl:otherwise>
     </xsl:choose>
@@ -669,6 +693,12 @@
         </xsl:attribute>
       </xsl:if>
       <xsl:apply-templates select="*[1]"/>
+      <xsl:if test="tml:g/tml:cursor">
+        <m:msub>
+          <m:mtext mathcolor="#808080">}</m:mtext>
+    	  <m:mtext><xsl:value-of select="@name"/></m:mtext>
+        </m:msub>
+      </xsl:if>
     </m:mstyle>
   </xsl:template>
 
@@ -946,4 +976,41 @@
     </m:mrow>
   </xsl:template>
 
+  <xsl:template match="tml:c[@name='red']">
+<!-- red  -->
+    <m:mstyle mathcolor="red">
+      <xsl:if test="@id">
+        <xsl:attribute name="xref">
+	  <xsl:value-of select="@id"/>
+	</xsl:attribute>
+	<xsl:apply-templates/>
+      </xsl:if>
+    </m:mstyle>
+  </xsl:template>
+
+  <xsl:template match="tml:c[@name='green']">
+<!-- green  -->
+    <m:mstyle mathcolor="green">
+      <xsl:if test="@id">
+        <xsl:attribute name="xref">
+	  <xsl:value-of select="@id"/>
+	</xsl:attribute>
+	<xsl:apply-templates/>
+      </xsl:if>
+    </m:mstyle>
+  </xsl:template>
+
+  <xsl:template match="tml:c[@name='duedelim']">
+<!-- duedelim  -->
+    <m:mfrac>
+      <xsl:if test="@id">
+        <xsl:attribute name="xref">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:apply-templates select="*[1]"/>
+      <xsl:apply-templates select="*[2]"/>
+    </m:mfrac>
+  </xsl:template>
+
 </xsl:stylesheet>