X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fhtml_reals.xsl;h=a78f454bdc490d7b625eb6a04eccfa0553555fb9;hb=89262281b6e83bd2321150f81f1a0583645eb0c8;hp=32c81792704447a2eef7bdf3716ceb997696a206;hpb=cc85f1b333f87ffe28de1979899da296a0200797;p=helm.git

diff --git a/helm/style/html_reals.xsl b/helm/style/html_reals.xsl
index 32c817927..a78f454bd 100644
--- a/helm/style/html_reals.xsl
+++ b/helm/style/html_reals.xsl
@@ -41,6 +41,9 @@
       <xsl:when test="$symbol = 'leadsto'">
        <xsl:value-of select="'&#174;'"/>
       </xsl:when>
+      <xsl:when test="$symbol = 'sum'">
+       <xsl:value-of select="'&#229;'"/>
+      </xsl:when>
       <xsl:otherwise>
        <xsl:text>???</xsl:text>
       </xsl:otherwise>
@@ -56,6 +59,9 @@
       <xsl:when test="$symbol = 'leadsto'">
        <xsl:value-of select="'&#8594;'"/>
       </xsl:when>
+      <xsl:when test="$symbol = 'sum'">
+       <xsl:value-of select="'&#x02211;'"/>
+      </xsl:when>
       <xsl:otherwise>
        <xsl:text>???</xsl:text>
       </xsl:otherwise>
@@ -72,16 +78,73 @@
 <!--                   INLINE MODE                                    -->
 <!-- **************************************************************** -->
 
+<!-- SUM -->
+
+<xsl:template mode="inline" match="m:apply[m:sum]">
+     <xsl:variable name="uri">
+      <xsl:value-of select="m:sum/@definitionURL"/>
+     </xsl:variable>
+     <xsl:choose>
+      <xsl:when test="$uri != ''">
+       <a href="{$uri}">
+       <!-- 
+       <FONT FACE="symbol" color="'blue'">
+        <xsl:value-of select="'&#229;'"/>
+       </FONT> -->
+       <xsl:call-template name="mksymbol-reals">
+        <xsl:with-param name="symbol" select="'sum'"/>
+      </xsl:call-template>
+       </a>
+      </xsl:when>
+      <xsl:otherwise>
+       <!-- 
+       <FONT FACE="symbol" color="'blue'">
+        <xsl:value-of select="'&#229;'"/>
+       </FONT> -->
+       <xsl:call-template name="mksymbol-reals">
+        <xsl:with-param name="symbol" select="'sum'"/>
+       </xsl:call-template>
+      </xsl:otherwise>
+     </xsl:choose>
+     <xsl:choose>
+      <xsl:when test="m:condition">
+       <SUB>
+        <xsl:apply-templates select="m:condition"/>
+       </SUB>
+      </xsl:when>
+      <xsl:otherwise>
+       <SUB>
+        <xsl:apply-templates select="m:lowlimit/*[1]"/>
+        <xsl:call-template name="mksymbol-init">
+         <xsl:with-param name="symbol" select="'leq'"/>
+        </xsl:call-template>
+        <xsl:apply-templates select="m:bvar/*[1]"/>
+        <xsl:call-template name="mksymbol-init">
+         <xsl:with-param name="symbol" select="'leq'"/>
+        </xsl:call-template>
+        <xsl:apply-templates select="m:uplimit/*[1]"/>
+       </SUB>
+      </xsl:otherwise>
+     </xsl:choose>
+     <xsl:apply-templates mode="inline" select="*[position()=last()]"/>
+ </xsl:template>
+
+
 <!-- LIMIT -->
 
 
 <xsl:template mode="inline" match="m:apply[m:limit]">
-     <xsl:variable name="uri">
-      <xsl:value-of select="m:limit/@definitionURL"/>
-     </xsl:variable>
-     <a href="{$uri}">
+     <xsl:variable name="uri"><xsl:value-of select="m:limit/@definitionURL"/></xsl:variable>
+     <xsl:choose>
+     <xsl:when test="$uri != ''">
+      <a href="{$uri}">
+       <xsl:text>lim</xsl:text>
+      </a>
+     </xsl:when>
+     <xsl:otherwise>
       <xsl:text>lim</xsl:text>
-     </a>
+     </xsl:otherwise>
+     </xsl:choose>
      <SUB>
       <xsl:apply-templates select="m:bvar/m:ci"/>
       <xsl:call-template name="mksymbol-reals">
@@ -95,17 +158,27 @@
 <!-- DIFFERENTIATION -->
 
 <xsl:template mode="inline" match="m:apply[m:diff]">
-     <xsl:variable name="uri">
-      <xsl:value-of select="m:diff/@definitionURL"/>
-     </xsl:variable>
-     <a href="{$uri}">
+     <xsl:variable name="uri"><xsl:value-of select="m:diff/@definitionURL"/></xsl:variable>
+     <xsl:choose>
+     <xsl:when test="$uri != ''">
+      <a href="{$uri}">
+       <SUP>d</SUP>
+       <xsl:text>/</xsl:text>
+       <SUB>
+        <xsl:text>d</xsl:text>
+        <xsl:value-of select="m:bvar/m:ci"/>
+       </SUB>
+      </a>
+     </xsl:when>
+     <xsl:otherwise>
       <SUP>d</SUP>
-      <xsl:text>/</xsl:text>
-      <SUB>
-       <xsl:text>d</xsl:text>
-       <xsl:value-of select="m:bvar/m:ci"/>
-      </SUB>
-     </a>
+       <xsl:text>/</xsl:text>
+       <SUB>
+        <xsl:text>d</xsl:text>
+        <xsl:value-of select="m:bvar/m:ci"/>
+       </SUB>
+     </xsl:otherwise>
+     </xsl:choose>
      <xsl:apply-templates mode="inline" select="*[3]"/>
  </xsl:template>
 
@@ -155,9 +228,7 @@
 <!-- MIN and MAX (binari: estendere) -->
 
  <xsl:template mode="inline" match="m:apply[m:min|m:max]">
-  <xsl:variable name="uri">
-   <xsl:value-of select="*[1]/@definitionURL"/>
-  </xsl:variable>
+  <xsl:variable name="uri"><xsl:value-of select="*[1]/@definitionURL"/></xsl:variable>
   <xsl:variable name="symbol">
    <xsl:choose>
     <xsl:when test="m:min">
@@ -168,9 +239,16 @@
     </xsl:when>
    </xsl:choose>
   </xsl:variable>
-  <a href="{$uri}">
+  <xsl:choose>
+  <xsl:when test="$uri != ''">
+   <a href="{$uri}">
+    <xsl:value-of select="$symbol"/>
+   </a>
+  </xsl:when>
+  <xsl:otherwise>
    <xsl:value-of select="$symbol"/>
-  </a>
+  </xsl:otherwise>
+  </xsl:choose>
   <xsl:text>{</xsl:text>
   <xsl:apply-templates mode="inline" select="*[2]"/>
   <xsl:text>, </xsl:text>
@@ -182,21 +260,29 @@
 <!--                   COUNTING MODE                                    -->
 <!-- **************************************************************** -->
 
+<xsl:template match="m:apply[m:sum]">
+ <xsl:apply-templates mode="inline" select="."/>
+</xsl:template>
 
 <xsl:template match="m:apply[m:limit]">
   <xsl:param name="current_indent" select="0"/> 
   <xsl:param name="width" select="$framewidth"/>
-  <xsl:variable name="uri">
-   <xsl:value-of select="m:limit/@definitionURL"/>
-  </xsl:variable>
+  <xsl:variable name="uri"><xsl:value-of select="m:limit/@definitionURL"/></xsl:variable>
   <xsl:variable name="charlength">
    <xsl:apply-templates select="m:limit" mode="charcount"/>
   </xsl:variable>
   <xsl:choose>
     <xsl:when test="$charlength > $framewidth">
-     <a href="{$uri}">
+     <xsl:choose>
+     <xsl:when test="$uri != ''">
+      <a href="{$uri}">
+       <xsl:text>lim</xsl:text>
+      </a>
+     </xsl:when>
+     <xsl:otherwise>
       <xsl:text>lim</xsl:text>
-     </a>
+     </xsl:otherwise>
+     </xsl:choose>
      <SUB>
       <xsl:apply-templates select="m:bvar/m:ci"/>
       <xsl:call-template name="mksymbol-reals">
@@ -222,17 +308,27 @@
 <xsl:template match="m:apply[m:diff]">
   <xsl:param name="current_indent" select="0"/> 
   <xsl:param name="width" select="$framewidth"/>
-  <xsl:variable name="uri">
-   <xsl:value-of select="m:diff/@definitionURL"/>
-  </xsl:variable>
-     <a href="{$uri}">
-      <SUP>d</SUP>
-      <xsl:text>/</xsl:text>
-      <SUB>
-       <xsl:text>d</xsl:text>
-       <xsl:value-of select="m:bvar/m:ci"/>
-      </SUB>
-     </a>
+  <xsl:variable name="uri"><xsl:value-of select="m:diff/@definitionURL"/></xsl:variable>
+     <xsl:choose>
+     <xsl:when test="$uri != ''">
+      <a href="{$uri}">
+       <SUP>d</SUP>
+       <xsl:text>/</xsl:text>
+       <SUB>
+        <xsl:text>d</xsl:text>
+        <xsl:value-of select="m:bvar/m:ci"/>
+       </SUB>
+      </a>
+     </xsl:when>
+     <xsl:otherwise>
+       <SUP>d</SUP>
+       <xsl:text>/</xsl:text>
+       <SUB>
+        <xsl:text>d</xsl:text>
+        <xsl:value-of select="m:bvar/m:ci"/>
+       </SUB>
+     </xsl:otherwise>
+     </xsl:choose>
      <xsl:apply-templates select="*[3]">
       <xsl:with-param name="current_indent" select="$current_indent + 5"/>
      </xsl:apply-templates>
@@ -301,9 +397,7 @@
  <xsl:template match="m:apply[m:min|m:max]">
   <xsl:param name="current_indent" select="0"/> 
   <xsl:param name="width" select="$framewidth"/>
-  <xsl:variable name="uri">
-   <xsl:value-of select="*[1]/@definitionURL"/>
-  </xsl:variable>
+  <xsl:variable name="uri"><xsl:value-of select="*[1]/@definitionURL"/></xsl:variable>
   <xsl:variable name="charlength">
    <xsl:apply-templates select="*[1]" mode="charcount"/>
   </xsl:variable>
@@ -319,9 +413,16 @@
   </xsl:variable>
   <xsl:choose>
     <xsl:when test="$charlength > $framewidth">
-     <a href="{$uri}">
+     <xsl:choose>
+     <xsl:when test="$uri != ''">
+      <a href="{$uri}">
+       <xsl:value-of select="$symbol"/>
+      </a>
+     </xsl:when>
+     <xsl:otherwise>
       <xsl:value-of select="$symbol"/>
-     </a>
+     </xsl:otherwise>
+     </xsl:choose>
      <xsl:text>{</xsl:text>
      <xsl:apply-templates select="*[2]">
       <xsl:with-param name="current_indent" select="$current_indent + 2"/>
@@ -344,8 +445,8 @@
 
 <!-- COUNTING -->
 
-<xsl:template match="m:abs|m:fact|m:root
-           |m:limit|m:diff|m:min|m:max" mode="charcount">
+<xsl:template match="m:abs|m:fact|m:root|
+           m:sum|m:limit|m:diff|m:min|m:max" mode="charcount">
 <xsl:param name="incurrent_length" select="0"/> 
     <xsl:choose>
     <xsl:when test="$framewidth >= ($incurrent_length + string-length())">