X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fmml2mmlv1_0.xsl;h=c4210dd3cafca81099317ab9e65a6d75f2fbf5af;hb=c5d44ddea495d6f20c05267e0ebd158972a21987;hp=330da7a24d6e6806e353ed10840b27f4ce6fc603;hpb=ef35bce6975cc94557ecdce77a2d7fb4dd8adb4c;p=helm.git

diff --git a/helm/style/mml2mmlv1_0.xsl b/helm/style/mml2mmlv1_0.xsl
index 330da7a24..c4210dd3c 100644
--- a/helm/style/mml2mmlv1_0.xsl
+++ b/helm/style/mml2mmlv1_0.xsl
@@ -22,7 +22,7 @@
 
 <!-- ====================================================== -->
 <!--  June, 2000 - HELM group:                              -->
-<!--  Added auxiliary function to inser:                    -->
+<!--  Added auxiliary function to insert:                    -->
 <!--  1) backwards pointers: helm:xref                      -->
 <!--  2) references to definitions: xlink:href              -->
 <!--  Added call-templates to the functions:                -->
@@ -233,10 +233,15 @@
 
 <!-- BASIC ELEMENTS -->
 
+<!-- HELM: cn could not contain MAthMl presentation -->
 <xsl:template match = "m:cn">
   <xsl:param name="IN_PREC" select="$NO_PREC"/>
   <xsl:param name="PAREN" select="$PAR_NO"/>
   <xsl:param name="PAR_NO_IGNORE" select="$YES"/>
+<!-- HELM: added -->
+<xsl:choose>
+  <xsl:when test="child::text()">
+<!-- HELM -->
   <xsl:choose>
     <xsl:when test=". &lt; 0 and $IN_PREC &gt; 0 and $PAREN=$PAR_NO and $PAR_NO_IGNORE=$NO">
       <m:mfenced separators="">
@@ -247,6 +252,13 @@
       <xsl:apply-templates select="." mode="cn"/>
     </xsl:otherwise>
   </xsl:choose>
+<!-- HELM: added -->
+</xsl:when>
+  <xsl:otherwise>
+   <xsl:copy-of select="*"/> 
+  </xsl:otherwise>
+ </xsl:choose>
+<!-- HELM -->
 </xsl:template>
 
 <xsl:template match = "m:cn" mode="cn">
@@ -343,22 +355,40 @@
       <m:mi fontweight="bold"> <xsl:apply-templates mode = "semantics"/> </m:mi>
     </xsl:when>
     <xsl:otherwise>
+<!-- HELM: ci could not contain MathML presentation 
      <m:mi> 
       <xsl:call-template name="insert"/>
       <xsl:apply-templates mode = "semantics"/> 
      </m:mi>
+-->
+ <xsl:choose>
+  <!-- HELM: or the opposite test <xsl:when test="*[1]"> -->
+  <xsl:when test="child::text()">
+   <m:mi> 
+    <xsl:call-template name="insert"/>
+    <xsl:apply-templates mode = "semantics"/> 
+   </m:mi>
+  </xsl:when>
+  <xsl:otherwise>
+   <m:mrow>
+    <xsl:call-template name="insert"/>
+    <xsl:copy-of select="*"/>
+   </m:mrow>
+  </xsl:otherwise>
+ </xsl:choose>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
+
 <xsl:template match = "m:csymbol">
-  <xsl:choose>
+   <xsl:choose>
     <xsl:when test="*[1]">
-      <xsl:copy-of select = "*"/>
+     <xsl:copy-of select = "*"/>
     </xsl:when>
-    <xsl:otherwise>
-      <m:mo> <xsl:apply-templates mode = "semantics"/> </m:mo>
-    </xsl:otherwise>
+   <xsl:otherwise>
+    <m:mo> <xsl:apply-templates mode = "semantics"/> </m:mo>
+   </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
@@ -914,7 +944,7 @@
   </xsl:apply-templates>
   <xsl:if test="*[3]">
     <xsl:for-each select = "*[position()>2]">
-<!-- HELM: MODIFICA PROVVISORIA -->
+<!-- HELM: to distinguish between * and the application -->
 <!--      <m:mo><xsl:call-template name="insert2"/>
                 <mchar name="InvisibleTimes"/> </m:mo> -->
       <m:mo><xsl:call-template name="insert2"/>*</m:mo>
@@ -927,10 +957,10 @@
   </xsl:if>
 </xsl:template>
 
-<!-- HELM: COMMENTO : dove metto la uri della definizione di radice ???? -->
 
 <xsl:template match = "m:apply[m:root[1]]">
   <m:msqrt>
+    <xsl:call-template name="insert1"/>
     <xsl:call-template name="insert_xref"/>
     <xsl:if test="*[2]=m:degree">
       <xsl:apply-templates select="*[3]" mode = "semantics"/>
@@ -1128,7 +1158,10 @@
 <xsl:template match = "m:apply[m:not[1]]">
   <m:mrow>
     <xsl:call-template name="insert_xref"/>
+<!-- CSC, per estetica!
     <m:mo><xsl:call-template name="insert1"/>not</m:mo>
+-->
+    <m:mo><xsl:call-template name="insert1"/><m:mchar name="not"/></m:mo>
     <xsl:apply-templates select = "*[2]" mode = "semantics">
       <xsl:with-param name="IN_PREC" select="$FUNCTION_PREC"/>
     </xsl:apply-templates>