Raw mode now really considers compressed/not compressed

[helm.git] / helm / style / content_to_html.xsl

diff --git a/helm/style/content_to_html.xsl b/helm/style/content_to_html.xsl
index 30d7009cf684e069a799f7d8caef7fec73513046..533cf22998ed1cceaa23e55e7f89644e601a0a00 100644 (file)
--- a/helm/style/content_to_html.xsl
+++ b/helm/style/content_to_html.xsl
@@ -35,6 +35,7 @@
 <xsl:param name="getterURL" select="'http://localhost:8081/'"/>
 <xsl:param name="processorURL" select="'http://localhost:8080/helm/servlet/uwobo/'"/>
 <xsl:param name="keys" select="'C1,HC2'"/>
+<xsl:param name="naturalLanguage" select="'yes'"/>
 
 <xsl:variable name="absPath"><xsl:value-of select="$getterURL"/>getciconly?uri=</xsl:variable>
 
@@ -55,8 +56,18 @@
 <!-- HTML Head and Body                                                    -->
 <!--***********************************************************************-->
 
-<!-- <xsl:output method="html"/> -->
-<xsl:output method="html" encoding="iso-8859-1"/>
+<!-- <xsl:output method="html" encoding="iso-8859-1"/> -->
+
+<!-- document needs method="xml" and searches locally for the dtd if        -->
+<!-- doctype-system is specified (the dtd must exist locally for parsing).  -->
+<!-- For having output html must be media-type="html" and for having the    -->
+<!-- correct <br /> you must specify at least the remote dtd by means of    -->
+<!-- doctype-public                                                         -->
+<xsl:output 
+       method="xml" 
+       encoding="iso-8859-1" 
+       media-type="text/html"
+       doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" />
 
 <xsl:variable name="framewidth" select="36"/>
 
@@ -274,16 +285,16 @@
      <FONT color="red">From&#x00a0;</FONT>
      <xsl:apply-templates select="*[2]"/>
      <FONT color="red">&#x00a0;we get</FONT>
-     <m:mtext>(</m:mtext>
+     (
      <xsl:apply-templates select="*[3]"/>
-     <m:mtext>)&#x00a0;</m:mtext>
+     )&#x00a0;
      <xsl:apply-templates mode="inline" select="*[4]"/>
      <FONT color="red">&#x00a0;and&#x00a0;</FONT>
-     <m:mtext>(</m:mtext>
+     (
      <xsl:apply-templates select="*[5]"/>
-     <m:mtext>)&#x00a0;</m:mtext>
+     )&#x00a0;
      <xsl:apply-templates mode="inline" select="*[6]"/>
-     <m:mtext>;</m:mtext>
+     ;
      <FONT color="red">&#x00a0;hence&#x00a0;</FONT>
      <xsl:apply-templates mode="inline" select="*[7]"/>
     </xsl:when>
@@ -616,9 +627,9 @@
       </xsl:when>
       <!-- Let -->
       <xsl:when test="$name='let'">
-       <m:mtext>(</m:mtext>
+       (
        <xsl:apply-templates select="m:ci"/>
-       <m:mtext>) </m:mtext>
+       )
        <xsl:apply-templates select="*[3]">
         <xsl:with-param name="current_indent" select="$current_indent + 7"/>
        </xsl:apply-templates>
@@ -681,9 +692,9 @@
        <xsl:call-template name="make_indent">
         <xsl:with-param name="current_indent" select="$current_indent"/> 
        </xsl:call-template>
-       <m:mtext>(</m:mtext>
+       (
        <xsl:apply-templates select="*[3]"/>
-       <m:mtext>)&#x00a0;</m:mtext>
+       )&#x00a0;
        <xsl:apply-templates select="*[4]">
         <xsl:with-param name="current_indent" select="$current_indent + 9"/> 
        </xsl:apply-templates>
@@ -691,9 +702,9 @@
        <xsl:call-template name="make_indent">
         <xsl:with-param name="current_indent" select="$current_indent"/> 
        </xsl:call-template>
-       <m:mtext>(</m:mtext>
+       (
        <xsl:apply-templates select="*[5]"/>
-       <m:mtext>)&#x00a0;</m:mtext>
+       )&#x00a0;
        <xsl:apply-templates select="*[6]">
         <xsl:with-param name="current_indent" select="$current_indent + 9"/> 
        </xsl:apply-templates>
@@ -729,7 +740,7 @@
        <xsl:call-template name="make_indent">
         <xsl:with-param name="current_indent" select="$current_indent"/> 
        </xsl:call-template>
-       <m:mtext>*</m:mtext>
+       *
        <xsl:apply-templates select="*[4]">
         <xsl:with-param name="current_indent" select="$current_indent"/> 
        </xsl:apply-templates>
@@ -737,7 +748,7 @@
        <xsl:call-template name="make_indent">
         <xsl:with-param name="current_indent" select="$current_indent"/> 
        </xsl:call-template>
-       <m:mtext>*</m:mtext>
+       *
        <xsl:apply-templates select="*[5]">
         <xsl:with-param name="current_indent" select="$current_indent"/> 
        </xsl:apply-templates>
@@ -763,16 +774,16 @@
        </xsl:call-template>
        <FONT color="red">Let&#x00a0;</FONT>
        <xsl:apply-templates mode="inline" select="*[3]"/>
-       <m:mtext>:</m:mtext>
+       :
        <xsl:apply-templates mode="inline" select="*[4]"/>
        <FONT color="red">&#x00a0;such that</FONT>
        <br/>
        <xsl:call-template name="make_indent">
         <xsl:with-param name="current_indent" select="$current_indent"/> 
        </xsl:call-template>
-       <m:mtext>(</m:mtext>
+       (
        <xsl:apply-templates mode="inline" select="*[5]"/>
-       <m:mtext>)</m:mtext>
+       )
        <xsl:apply-templates select="*[6]">
         <xsl:with-param name="current_indent" select="$current_indent +7"/>
        </xsl:apply-templates>