X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Fmathml_editor%2Fxsl%2Ftml-mmlp.xsl;h=73d2ab049b9fea0eb85fa83f8ca285c6e021e1cd;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=7b225f0e3c1a2f15799e256d90c3634a7ef857db;hpb=c112706f347e08e7f345131fbc4c3aa0e9ecc7b5;p=helm.git

diff --git a/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl b/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl
index 7b225f0e3..73d2ab049 100644
--- a/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl
+++ b/helm/DEVEL/mathml_editor/xsl/tml-mmlp.xsl
@@ -38,6 +38,7 @@
   <xsl:param name="id" select="/.."/>
 
   <xsl:template match="/">
+   <wrapper>
     <xsl:choose>
       <xsl:when test="$id">
         <xsl:apply-templates select="descendant::*[@id=$id]"/>
@@ -46,21 +47,27 @@
         <xsl:apply-templates/>
       </xsl:otherwise>
     </xsl:choose>
+   </wrapper>
+  </xsl:template>
+
+  <xsl:template match="tml:tex[not(tml:math)]">
+    <!-- This is an empty TeX document. We generate the corresponding  -->
+    <!-- empty MathML document.                                        -->
   </xsl:template>
 
   <xsl:template match="tml:math">
-    <m:math>
-      <xsl:if test="@id">
-        <xsl:attribute name="xref">
-          <xsl:value-of select="@id"/>
-        </xsl:attribute>
-      </xsl:if>
-       <xsl:if test="@display='1'">
-        <xsl:attribute name="display">block</xsl:attribute>
-      </xsl:if>
-      <xsl:attribute name="display">block</xsl:attribute>
-      <xsl:apply-templates select="*"/>
-    </m:math>
+    <m:mstyle mathvariant="normal">
+     <xsl:if test="@id">
+       <xsl:attribute name="xref">
+         <xsl:value-of select="@id"/>
+       </xsl:attribute>
+     </xsl:if>
+      <xsl:if test="@display='1'">
+       <xsl:attribute name="display">block</xsl:attribute>
+     </xsl:if>
+     <xsl:attribute name="display">block</xsl:attribute>
+     <xsl:apply-templates select="*"/>
+    </m:mstyle>
   </xsl:template>
 
   <xsl:template match="tml:i">
@@ -96,6 +103,69 @@
     </m:mo>
   </xsl:template>
 
+  <xsl:template match="tml:s">
+<!-- this template is used only for testing purpose and should not be here-->
+    <m:mspace width="veryverythickmathspace">
+      <xsl:if test="@id">
+        <xsl:attribute name="xref">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </xsl:if>
+    </m:mspace>
+  </xsl:template>
+
+<!--
+  <xsl:template name="cursor">
+    <xsl:choose>
+      <xsl:when test="contains(@val, '\')">
+        <m:mrow>
+	  <xsl:if test="@id">
+	    <xsl:attribute name="xref">
+	      <xsl:value-of select="@id"/>
+	    </xsl:attribute>
+	  </xsl:if>
+	  <xsl:if test="substring-before(@val, '\')">
+            <m:mtext><xsl:value-of select="substring-before(@val, '\')"/></m:mtext>
+	  </xsl:if>
+          <m:mo stretchy="false">&#x2329;</m:mo>
+          <m:mtext mathcolor="blue"><xsl:value-of select="concat('\', substring-after(@val, '\'))"/></m:mtext>
+          <m:mo stretchy="false">&#x232a;</m:mo>
+	</m:mrow>
+      </xsl:when>
+      <xsl:when test="string-length(@val)>=1">
+        <m:mrow>
+	  <xsl:if test="@id">
+	    <xsl:attribute name="xref">
+	      <xsl:value-of select="@id"/>
+	    </xsl:attribute>
+	  </xsl:if>
+	  <xsl:choose>
+	    <xsl:when test="contains('0123456789', substring(@val, 1, 1))">
+              <m:mn>
+	        <xsl:value-of select="@val"/>
+	      </m:mn>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <m:mi>
+	        <xsl:value-of select="@val"/>
+	      </m:mi>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	  <m:mtext mathcolor="blue">I</m:mtext>
+	</m:mrow>
+      </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>I</m:mtext>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+  -->
+
   <xsl:template match="tml:o[@val='-']">
     <m:mo>
       <xsl:if test="@id">
@@ -107,7 +177,7 @@
     </m:mo>
   </xsl:template>
 
-  <xsl:template match="tml:cursor[@visible='1']">
+  <xsl:template match="tml:cursor">
     <xsl:choose>
       <xsl:when test="substring(@val,1,1)='\'">
         <m:mrow>
@@ -121,20 +191,45 @@
           <m:mo stretchy="false">&#x232a;</m:mo>
         </m:mrow>
       </xsl:when>
+      <xsl:when test="string-length(@val)>=1">
+        <m:mrow>
+	  <xsl:if test="@id">
+	    <xsl:attribute name="xref">
+	      <xsl:value-of select="@id"/>
+	    </xsl:attribute>
+	  </xsl:if>
+	  <xsl:choose>
+	    <xsl:when test="contains('0123456789', substring(@val, 1, 1))">
+              <m:mn>
+	        <xsl:value-of select="@val"/>
+	      </m:mn>
+	    </xsl:when>
+	    <xsl:otherwise>
+	      <m:mi>
+	        <xsl:value-of select="@val"/>
+	      </m:mi>
+	    </xsl:otherwise>
+	  </xsl:choose>
+	  <xsl:if test="@visible='1'">
+	   <m:mtext mathcolor="blue">I</m:mtext>
+	  </xsl:if>
+	</m:mrow>
+      </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"/>I</m:mtext>
+	<xsl:if test="@visible='1'">
+         <m:mtext mathcolor="blue">
+          <xsl:if test="@id">
+            <xsl:attribute name="xref">
+              <xsl:value-of select="@id"/>
+            </xsl:attribute>
+          </xsl:if>
+	  <xsl:text>I</xsl:text>
+	 </m:mtext>
+	</xsl:if>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template match="tml:cursor[not(@visible) or @visible='0']">
-  </xsl:template>
-
   <xsl:template match="tml:sb[@under='1'][*[1]/tml:sp[@over='1']]">
     <m:munderover>
       <xsl:if test="@id">
@@ -827,6 +922,18 @@
     </m:mstyle>
   </xsl:template>
 
+  <xsl:template match="tml:c[@name='_']">
+<!-- _ -->
+    <m:mi>
+      <xsl:if test="@id">
+        <xsl:attribute name="xref">
+          <xsl:value-of select="@id"/>
+        </xsl:attribute>
+      </xsl:if>
+      <xsl:text>_</xsl:text>
+    </m:mi>
+  </xsl:template>
+
   <xsl:template match="tml:c[@name=',']">
 <!-- , -->
     <m:mspace width="thinmathspace">
@@ -1037,9 +1144,17 @@
     </m:mfrac>
   </xsl:template>
 
-  <xsl:template match="tml:c[@name='space']">
-    <m:mspace width="veryverythickmathspace">
-    </m:mspace>
+  <xsl:template match="tml:c[@name='nodeside']">
+<!-- nodeside  -->
+    <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>