Modified Files:

1) content.xsl: added comments
2) mml2mmlv1_0.xsl: now cn and ci can contain MathML presentation
elements
3) mmlextension.xsl: nothing is changed

diff --git a/helm/style/content.xsl b/helm/style/content.xsl
index fa0b6a0bff8cf5af9d422b38ecff7b9698105b64..7d211d2f7e7c1758efb3d2d3a3d902db04bd76a2 100644 (file)
--- a/helm/style/content.xsl
+++ b/helm/style/content.xsl
@@ -25,14 +25,12 @@
            media-type="text/mathml" /> -->
 
 <!-- DA FARE: 
-1)risolvere nella fase di pre-processing le uri relative, settando l'attributo
+1)risolvere nella fase di pre-processing le uri relative delle var, settando 
+l'attributo
 definitionURL dell'oggetto corrispondente (alcuni punteranno a nulla! -quelli 
 che non hanno il file di definizione corrispondente-); [le uri assolute hanno
 la forma cic:/.../ in definitionURL e questo schema di uri verra' risolto da
 Amaya o da chi di dovere in /really_very_local/helm/PARSER/example/.../]
-2)aggiungere nei file xml gli ID, affinche' nello stylesheet si setti
-l'attributo xref di ogni oggetto per puntare (tramite ID) al suo corrispondente
-della rappresentazione interna. 
 -->
 
 <!--******************************************************************-->
@@ -47,11 +45,11 @@ della rappresentazione interna.
     <m:lambda helm:xref="{@id}">
      <m:bvar>
       <m:ci>
-       <m:msqrt>
-       <m:mi>
+      <!--<m:msqrt>
+       <m:mi>-->
         <xsl:value-of select="target/@binder"/>
-       </m:mi>
-       </m:msqrt>
+      <!-- </m:mi>
+       </m:msqrt>-->
       </m:ci>
       <m:type>
        <xsl:apply-templates select="source/*[1]" mode="noannot"/>

diff --git a/helm/style/mml2mmlv1_0.xsl b/helm/style/mml2mmlv1_0.xsl
index fd36e25132701af08b6eb6ce7eb788a49287f5e1..c88dd3da2a925c2a5fa8dcfc6582ae2dde583f9c 100644 (file)
--- a/helm/style/mml2mmlv1_0.xsl
+++ b/helm/style/mml2mmlv1_0.xsl
@@ -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,14 +355,14 @@
       <m:mi fontweight="bold"> <xsl:apply-templates mode = "semantics"/> </m:mi>
     </xsl:when>
     <xsl:otherwise>
-<!-- <CSC> Originale:
+<!-- HELM: ci could not contain MathML presentation 
      <m:mi> 
       <xsl:call-template name="insert"/>
       <xsl:apply-templates mode = "semantics"/> 
      </m:mi>
-</CSC> -->
-<!-- <CSC> Modificato: -->
+-->
  <xsl:choose>
+  <!-- HELM: or the opposite test <xsl:when test="*[1]"> -->
   <xsl:when test="child::text()">
    <m:mi> 
     <xsl:call-template name="insert"/>
@@ -358,22 +370,22 @@
    </m:mi>
   </xsl:when>
   <xsl:otherwise>
-   <xsl:copy-of select="*"/> 
+   <xsl:copy-of select="*"/>
   </xsl:otherwise>
  </xsl:choose>
-<!-- </CSC> -->
     </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>
 
@@ -929,7 +941,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>
@@ -942,10 +954,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"/>

diff --git a/helm/style/mmlextension.xsl b/helm/style/mmlextension.xsl
index 87e31e8aede6e02d8e4e8e803a25bac13cf9ec55..d467b77af79d18b15e7129e780ba83a35019c703 100644 (file)
--- a/helm/style/mmlextension.xsl
+++ b/helm/style/mmlextension.xsl
@@ -18,7 +18,7 @@
 <!-- Parameter affecting line-breaking                                     -->
 <!--***********************************************************************-->
 
-<xsl:variable name="framewidth" select="30"/>
+<xsl:variable name="framewidth" select="35"/>
 
 <!--***********************************************************************-->
 <!-- Gli oggetti sono stampati come mtext all'interno di una marca toplevel-->
@@ -1221,9 +1221,9 @@
 <xsl:template match = "m:set">
  <xsl:choose>
   <xsl:when test="count(child::*) = 0">
-   <m:mo> 
-    <m:mchar name="EmptySet"/>
-   </m:mo>
+   <m:mi> 
+    <m:mchar name="emptyset"/>
+   </m:mi>
   </xsl:when>
   <xsl:otherwise>
    <xsl:variable name="charlength">