X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fstyle%2Fhtml_init.xsl;h=d3c9d19926ef18b55196995aa961e34eb8207c4c;hb=0db688b75474e712a3ec7f05180b0cb06002fae2;hp=93791685ce848fbd5780dcf0e7cf7aea8b6ae80d;hpb=cc85f1b333f87ffe28de1979899da296a0200797;p=helm.git

diff --git a/helm/style/html_init.xsl b/helm/style/html_init.xsl
index 93791685c..d3c9d1992 100644
--- a/helm/style/html_init.xsl
+++ b/helm/style/html_init.xsl
@@ -62,6 +62,9 @@
       </xsl:when>
       <xsl:when test="$symbol = 'times'">
        <xsl:value-of select="'&#42;'"/>
+      </xsl:when> 
+      <xsl:when test="$symbol = 'divide'">
+       <xsl:value-of select="'&#47;'"/>
       </xsl:when>
       <xsl:when test="$symbol = 'minus'">
        <xsl:value-of select="'&#45;'"/>
@@ -114,6 +117,9 @@
       <xsl:when test="$symbol = 'times'">
        <xsl:value-of select="'&#8727;'"/>
       </xsl:when>
+      <xsl:when test="$symbol = 'divide'">
+       <xsl:value-of select="'&#47;'"/>
+      </xsl:when>
       <xsl:when test="$symbol = 'minus'">
        <xsl:value-of select="'&#8722;'"/>
       </xsl:when>
@@ -143,18 +149,41 @@
 
 <!-- INLINE MODE : BASIC OPERATORS -->
 
+<xsl:template mode="inline" match="m:infinity">
+ <xsl:choose>
+  <xsl:when test="$UNICODEvsSYMBOL = 'symbol'">
+   <FONT FACE="symbol" color="'blue'">
+    <xsl:value-of select="'&#165;'"/>
+   </FONT>
+  </xsl:when>
+  <xsl:otherwise>
+   <FONT color="'blue'">
+    <!-- VERIFICARE -->
+    <xsl:value-of select="'&#165;'"/>
+   </FONT>
+  </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
  <xsl:template mode="inline" match="m:apply[m:and|m:or|m:eq|m:neq|m:leq|m:lt
-       |m:geq|m:gt|m:plus|m:times]">
-  <xsl:variable name="uri">
-   <xsl:value-of select="*[1]/@definitionURL"/>
-  </xsl:variable>
+       |m:geq|m:gt|m:plus|m:times|m:divide]">
+  <xsl:variable name="uri"><xsl:value-of select="*[1]/@definitionURL"/></xsl:variable>
   <xsl:text>(</xsl:text>
   <xsl:apply-templates mode="inline" select="*[2]"/>
-  <a href="{$uri}">
+  <xsl:choose>
+  <xsl:when test="$uri != ''">
+   <a href="{$uri}">
+    <xsl:call-template name="mksymbol-init">
+     <xsl:with-param name="symbol" select="local-name(*[1])"/>
+    </xsl:call-template>
+   </a>
+  </xsl:when>
+  <xsl:otherwise>
    <xsl:call-template name="mksymbol-init">
-    <xsl:with-param name="symbol" select="local-name(*[1])"/>
+     <xsl:with-param name="symbol" select="local-name(*[1])"/>
    </xsl:call-template>
-  </a>
+  </xsl:otherwise>
+  </xsl:choose>
   <xsl:apply-templates mode="inline" select="*[3]"/>
   <xsl:text>)</xsl:text>
  </xsl:template>
@@ -162,26 +191,42 @@
 <!-- INLINE MODE - MINUS (can be unary!) -->
 
 <xsl:template mode="inline" match="m:apply[m:minus]">
-  <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:choose>
    <xsl:when test="count(child::*)=2">
-    <a href="{$uri}">
+    <xsl:choose>
+    <xsl:when test="$uri != ''">
+     <a href="{$uri}">
+      <xsl:call-template name="mksymbol-init">
+       <xsl:with-param name="symbol" select="'minus'"/>
+      </xsl:call-template>
+     </a>
+    </xsl:when>
+    <xsl:otherwise>
      <xsl:call-template name="mksymbol-init">
-      <xsl:with-param name="symbol" select="'minus'"/>
+       <xsl:with-param name="symbol" select="'minus'"/>
      </xsl:call-template>
-    </a>
+    </xsl:otherwise>
+    </xsl:choose>
     <xsl:apply-templates mode="inline" select="*[2]"/>
    </xsl:when>
    <xsl:otherwise>
     <xsl:text>(</xsl:text>
     <xsl:apply-templates mode="inline" select="*[2]"/>
-    <a href="{$uri}">
+    <xsl:choose>
+    <xsl:when test="$uri != ''">
+     <a href="{$uri}">
+      <xsl:call-template name="mksymbol-init">
+       <xsl:with-param name="symbol" select="'minus'"/>
+      </xsl:call-template>
+     </a>
+    </xsl:when>
+    <xsl:otherwise>
      <xsl:call-template name="mksymbol-init">
-      <xsl:with-param name="symbol" select="'minus'"/>
+       <xsl:with-param name="symbol" select="'minus'"/>
      </xsl:call-template>
-    </a>
+    </xsl:otherwise>
+    </xsl:choose>
     <xsl:apply-templates mode="inline" select="*[3]"/>
     <xsl:text>)</xsl:text>
    </xsl:otherwise>
@@ -190,29 +235,43 @@
 
 <!-- INLINE MODE NOT -->
 
- <xsl:template mode="inline" match="m:apply[m:not]">
-  <xsl:variable name="uri">
-   <xsl:value-of select="m:not/@definitionURL"/>
-  </xsl:variable>
-     <a href="{$uri}">
-      <xsl:call-template name="mksymbol-init">
-       <xsl:with-param name="symbol" select="'not'"/>
-      </xsl:call-template>
-     </a>
-     <xsl:apply-templates mode="inline" select="*[2]"/>
- </xsl:template>
+<xsl:template mode="inline" match="m:apply[m:not]">
+  <xsl:variable name="uri"><xsl:value-of select="m:not/@definitionURL"/></xsl:variable>
+  <xsl:choose>
+  <xsl:when test="$uri != ''">
+   <a href="{$uri}">
+    <xsl:call-template name="mksymbol-init">
+     <xsl:with-param name="symbol" select="'not'"/>
+    </xsl:call-template>
+   </a>
+  </xsl:when>
+  <xsl:otherwise>
+   <xsl:call-template name="mksymbol-init">
+    <xsl:with-param name="symbol" select="'not'"/>
+   </xsl:call-template>
+  </xsl:otherwise>
+  </xsl:choose>
+  <xsl:apply-templates mode="inline" select="*[2]"/>
+</xsl:template>
 
 <!-- INLINE MODE EXISTS -->
 
  <xsl:template mode="inline" match="m:apply[m:exists]">
-  <xsl:variable name="uri">
-   <xsl:value-of select="m:exists/@definitionURL"/>
-  </xsl:variable>
-  <a href="{$uri}">
+  <xsl:variable name="uri"><xsl:value-of select="m:exists/@definitionURL"/></xsl:variable>
+  <xsl:choose>
+  <xsl:when test="$uri != ''">
+   <a href="{$uri}">
+    <xsl:call-template name="mksymbol-init">
+     <xsl:with-param name="symbol" select="'exists'"/>
+    </xsl:call-template>
+   </a>
+  </xsl:when>
+  <xsl:otherwise>
    <xsl:call-template name="mksymbol-init">
     <xsl:with-param name="symbol" select="'exists'"/>
    </xsl:call-template>
-  </a>
+  </xsl:otherwise>
+  </xsl:choose>
   <xsl:apply-templates select="m:bvar/m:ci"/>
   <xsl:text>:</xsl:text>
   <xsl:apply-templates mode="inline" select="m:condition"/>
@@ -225,12 +284,10 @@
 <!-- BASIC OPERATORS -->
 
  <xsl:template match="m:apply[m:and|m:or|m:eq|m:neq|m:leq|m:lt
-       |m:geq|m:gt|m:plus|m:times]">
+       |m:geq|m:gt|m:plus|m:times|m:divide]">
   <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>
@@ -244,11 +301,20 @@
      <xsl:call-template name="make_indent">
       <xsl:with-param name="current_indent" select="$current_indent + 2"/> 
      </xsl:call-template>
-     <a href="{$uri}">
-      <xsl:call-template name="mksymbol-init">
-       <xsl:with-param name="symbol" select="local-name(*[1])"/>
-      </xsl:call-template>
-     </a>
+     <xsl:choose>
+     <xsl:when test="$uri != ''">
+      <a href="{$uri}">
+       <xsl:call-template name="mksymbol-init">
+        <xsl:with-param name="symbol" select="local-name(*[1])"/>
+       </xsl:call-template>
+      </a>
+     </xsl:when>
+     <xsl:otherwise>
+       <xsl:call-template name="mksymbol-init">
+        <xsl:with-param name="symbol" select="local-name(*[1])"/>
+       </xsl:call-template>
+     </xsl:otherwise>
+     </xsl:choose>
      <xsl:apply-templates select="*[3]">
       <xsl:with-param name="current_indent" select="$current_indent + 2"/>
      </xsl:apply-templates>
@@ -265,16 +331,23 @@
 <xsl:template match="m:apply[m:minus]">
   <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:choose>
    <xsl:when test="count(child::*)=2">
-    <a href="{$uri}">
-     <xsl:call-template name="mksymbol-init">
-      <xsl:with-param name="symbol" select="'minus'"/>
-     </xsl:call-template>
-    </a>
+    <xsl:choose>
+    <xsl:when test="$uri != ''">
+     <a href="{$uri}">
+      <xsl:call-template name="mksymbol-init">
+       <xsl:with-param name="symbol" select="'minus'"/>
+      </xsl:call-template>
+     </a>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="mksymbol-init">
+       <xsl:with-param name="symbol" select="'minus'"/>
+      </xsl:call-template>
+    </xsl:otherwise>
+    </xsl:choose>
     <xsl:apply-templates select="*[2]">
      <xsl:with-param name="current_indent" select="$current_indent + 1"/>
     </xsl:apply-templates>
@@ -293,11 +366,20 @@
       <xsl:call-template name="make_indent">
        <xsl:with-param name="current_indent" select="$current_indent + 2"/> 
       </xsl:call-template>
-      <a href="{$uri}">
-       <xsl:call-template name="mksymbol-init">
-        <xsl:with-param name="symbol" select="'minus'"/>
-       </xsl:call-template>
-      </a>
+      <xsl:choose>
+      <xsl:when test="$uri != ''">
+       <a href="{$uri}">
+        <xsl:call-template name="mksymbol-init">
+         <xsl:with-param name="symbol" select="'minus'"/>
+        </xsl:call-template>
+       </a>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:call-template name="mksymbol-init">
+         <xsl:with-param name="symbol" select="'minus'"/>
+        </xsl:call-template>
+      </xsl:otherwise>
+      </xsl:choose>  
       <xsl:apply-templates select="*[3]">
        <xsl:with-param name="current_indent" select="$current_indent + 2"/>
       </xsl:apply-templates>
@@ -313,18 +395,25 @@
 
 <!-- NOT -->
 
- <xsl:template match="m:apply[m:not]">
+<xsl:template match="m:apply[m:not]">
   <xsl:param name="current_indent" select="0"/> 
   <xsl:param name="width" select="$framewidth"/>
-  <xsl:variable name="uri">
-   <xsl:value-of select="m:not/@definitionURL"/>
-  </xsl:variable>
-     <a href="{$uri}">
-      <xsl:call-template name="mksymbol-init">
-       <xsl:with-param name="symbol" select="'not'"/>
-      </xsl:call-template>
-     </a>
-     <xsl:apply-templates select="*[2]"/>
+  <xsl:variable name="uri"><xsl:value-of select="m:not/@definitionURL"/></xsl:variable>
+   <xsl:choose>
+   <xsl:when test="$uri != ''">
+    <a href="{$uri}">
+     <xsl:call-template name="mksymbol-init">
+      <xsl:with-param name="symbol" select="'not'"/>
+     </xsl:call-template>
+    </a>
+   </xsl:when>
+   <xsl:otherwise>
+     <xsl:call-template name="mksymbol-init">
+      <xsl:with-param name="symbol" select="'not'"/>
+     </xsl:call-template>
+   </xsl:otherwise>
+   </xsl:choose>
+   <xsl:apply-templates select="*[2]"/>
  </xsl:template>
 
 <!-- EXISTS -->
@@ -332,19 +421,26 @@
  <xsl:template match="m:apply[m:exists]">
   <xsl:param name="current_indent" select="0"/> 
   <xsl:param name="width" select="$framewidth"/>
-  <xsl:variable name="uri">
-   <xsl:value-of select="m:exists/@definitionURL"/>
-  </xsl:variable>
+  <xsl:variable name="uri"><xsl:value-of select="m:exists/@definitionURL"/></xsl:variable>
   <xsl:variable name="charlength">
    <xsl:apply-templates select="m:exists" mode="charcount"/>
   </xsl:variable>
   <xsl:choose>
     <xsl:when test="$charlength > $framewidth">
-     <a href="{$uri}">
-      <xsl:call-template name="mksymbol-init">
-       <xsl:with-param name="symbol" select="'exists'"/>
-      </xsl:call-template>
-     </a>
+     <xsl:choose>
+     <xsl:when test="$uri != ''">
+      <a href="{$uri}">
+       <xsl:call-template name="mksymbol-init">
+        <xsl:with-param name="symbol" select="'exists'"/>
+       </xsl:call-template>
+      </a>
+     </xsl:when>
+     <xsl:otherwise>
+       <xsl:call-template name="mksymbol-init">
+        <xsl:with-param name="symbol" select="'exists'"/>
+       </xsl:call-template>
+     </xsl:otherwise>
+     </xsl:choose>
      <xsl:apply-templates select="m:bvar/m:ci"/>
      <xsl:text>:</xsl:text>
      <xsl:apply-templates select="m:condition">
@@ -393,5 +489,3 @@
 </xsl:template> 
 
 </xsl:stylesheet> 
-
-