X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fhelp%2FC%2Fsec_commands.xml;h=7e22f33043d39ec5e0fcb62e7ce0c20ca1e41593;hb=e880d6eab5e1700f4a625ddcd7d0fa8f0cce2dcc;hp=636eac8dc236a66cb744ca5fa8d59e2c5c86ed50;hpb=65317d14f32bc24b3e9ed4ea144833dd8517773a;p=helm.git

diff --git a/helm/software/matita/help/C/sec_commands.xml b/helm/software/matita/help/C/sec_commands.xml
index 636eac8dc..7e22f3304 100644
--- a/helm/software/matita/help/C/sec_commands.xml
+++ b/helm/software/matita/help/C/sec_commands.xml
@@ -74,26 +74,87 @@
      </variablelist>
    </para>
  </sect1>
+ <sect1 id="command_eval">
+   <title>eval</title>
+   <para><userinput>eval red on t</userinput></para>
+   <para>
+     <variablelist>
+       <varlistentry>
+         <term>Synopsis:</term>
+         <listitem>
+           <para><emphasis role="bold">eval</emphasis> 
+            &reduction-kind; 
+             <emphasis role="bold">on</emphasis>
+             &term;</para>
+         </listitem>
+       </varlistentry>
+       <varlistentry>
+         <term>Action:</term>
+         <listitem>
+           <para>Opens a CIC browser window that shows 
+             the reduct of 
+             <command>t</command>
+             together with its type.</para>
+         </listitem>
+       </varlistentry>
+     </variablelist>
+   </para>
+ </sect1>
+ <sect1 id="command_prefer_coercion">
+   <title>prefer coercion</title>
+   <para><userinput>prefer coercion u</userinput></para>
+   <para>
+     <variablelist>
+       <varlistentry>
+         <term>Synopsis:</term>
+         <listitem>
+		 <para>
+			 <emphasis role="bold">prefer coercion</emphasis> 
+       (&uri; | &term;)
+		 </para>
+         </listitem>
+       </varlistentry>
+       <varlistentry>
+         <term>Action:</term>
+         <listitem>
+           <para>The already declared coercion <command>u</command> 
+             is preferred to other coercions with the same source and target.
+           </para>
+         </listitem>
+       </varlistentry>
+     </variablelist>
+   </para>
+ </sect1>
  <sect1 id="command_coercion">
    <title>coercion</title>
-   <para><userinput>coercion u</userinput></para>
+   <para><userinput>coercion u with ariety saturation nocomposites</userinput></para>
    <para>
      <variablelist>
        <varlistentry>
          <term>Synopsis:</term>
          <listitem>
-           <para><emphasis role="bold">coercion</emphasis> &uri;</para>
+		 <para>
+			 <emphasis role="bold">coercion</emphasis> 
+			 (&uri; | &term; <emphasis role="bold">with</emphasis>)
+			 [ &nat; [&nat;]] 
+			 [ <emphasis role="bold">nocomposites</emphasis> ]
+		 </para>
          </listitem>
        </varlistentry>
        <varlistentry>
          <term>Action:</term>
          <listitem>
-           <para>Declares <command>u</command> as an implicit coercion
-            from the type of its last argument (source)
-            to its codomain (target). Every time a term <command>x</command>
+		 <para>Declares <command>u</command> as an implicit coercion.
+		 If the type of <command>u</command> is 	
+		 <command>∀x1:T1. … ∀x(n-1):T(n-1).Tn</command> the coercion target is
+		 <command>T(n - ariety)</command> while its source is 
+		 <command>T(n - ariety - saturation - 1)</command>.
+	    Every time a term <command>x</command>
             of type source is used with expected type target, Matita
             automatically replaces <command>x</command> with
-            <command>(u ? … ? x)</command> to avoid a typing error.</para>
+            <command>(u ? … ? x ? … ?)</command> to avoid a typing error.</para>
+            Note that the number of <command>?</command> added after 
+	    <command>x</command> is saturation.
            <para>Implicit coercions are not displayed to the user:
             <command>(u ? … ? x)</command> is rendered simply
             as <command>x</command>.</para>
@@ -102,7 +163,8 @@
             and there is already a coercion <command>u'</command> of
             target <command>s</command> or source <command>t</command>,
             a composite implicit coercion is automatically computed
-            by Matita.</para>
+	    by Matita unless <emphasis role="bold">nocomposites</emphasis> 
+	    is specified.</para>
          </listitem>
        </varlistentry>
      </variablelist>
@@ -139,7 +201,7 @@
            </para>
            <table>
             <title>clusters</title>
-            <tgroup cols="5">
+            <tgroup cols="6">
             <thead>
              <row>
               <entry>name</entry>
@@ -148,6 +210,12 @@
               <entry>expected object for 3rd URI</entry>
               <entry>expected object for 4th URI</entry>
               <entry>expected object for 5th URI</entry>
+              <entry>expected object for 6th URI</entry>
+              <entry>expected object for 7th URI</entry>
+              <entry>expected object for 8th URI</entry>
+              <entry>expected object for 9th URI</entry>
+              <entry>expected object for 10th URI</entry>
+              <entry>expected object for 11th URI</entry>
              </row>
             </thead>
             <tbody>
@@ -158,6 +226,12 @@
               <entry>a theorem of type <emphasis role="bold">∀</emphasis>A.<emphasis role="bold">∀</emphasis>x,y,z:A.eq A x y <emphasis role="bold">→</emphasis> eq A y z <emphasis role="bold">→</emphasis> eq A x z</entry>
               <entry><emphasis role="bold">∀</emphasis>A.<emphasis role="bold">∀</emphasis>a.<emphasis role="bold">∀</emphasis> P:A <emphasis role="bold">→</emphasis> <emphasis role="bold">Prop</emphasis>.P x <emphasis role="bold">→</emphasis> <emphasis role="bold">∀</emphasis>y.eq A x y <emphasis role="bold">→</emphasis> P y</entry>
               <entry><emphasis role="bold">∀</emphasis>A.<emphasis role="bold">∀</emphasis>a.<emphasis role="bold">∀</emphasis> P:A <emphasis role="bold">→</emphasis> <emphasis role="bold">Prop</emphasis>.P x <emphasis role="bold">→</emphasis> <emphasis role="bold">∀</emphasis>y.eq A y x <emphasis role="bold">→</emphasis> P y</entry>
+              <entry><emphasis role="bold">∀</emphasis>A.<emphasis role="bold">∀</emphasis>a.<emphasis role="bold">∀</emphasis> P:A <emphasis role="bold">→</emphasis> <emphasis role="bold">Set</emphasis>.P x <emphasis role="bold">→</emphasis> <emphasis role="bold">∀</emphasis>y.eq A x y <emphasis role="bold">→</emphasis> P y</entry>
+              <entry><emphasis role="bold">∀</emphasis>A.<emphasis role="bold">∀</emphasis>a.<emphasis role="bold">∀</emphasis> P:A <emphasis role="bold">→</emphasis> <emphasis role="bold">Set</emphasis>.P x <emphasis role="bold">→</emphasis> <emphasis role="bold">∀</emphasis>y.eq A y x <emphasis role="bold">→</emphasis> P y</entry>
+              <entry><emphasis role="bold">∀</emphasis>A.<emphasis role="bold">∀</emphasis>a.<emphasis role="bold">∀</emphasis> P:A <emphasis role="bold">→</emphasis> <emphasis role="bold">Type</emphasis>.P x <emphasis role="bold">→</emphasis> <emphasis role="bold">∀</emphasis>y.eq A x y <emphasis role="bold">→</emphasis> P y</entry>
+              <entry><emphasis role="bold">∀</emphasis>A.<emphasis role="bold">∀</emphasis>a.<emphasis role="bold">∀</emphasis> P:A <emphasis role="bold">→</emphasis> <emphasis role="bold">Type</emphasis>.P x <emphasis role="bold">→</emphasis> <emphasis role="bold">∀</emphasis>y.eq A y x <emphasis role="bold">→</emphasis> P y</entry>
+              <entry><emphasis role="bold">∀</emphasis>A.<emphasis role="bold">∀</emphasis>B.<emphasis role="bold">∀</emphasis> f:A <emphasis role="bold">→</emphasis> B.<emphasis role="bold">∀</emphasis>x,y:A.eq A x y <emphasis role="bold">→</emphasis> eq B (f x) (f y)</entry>
+              <entry><emphasis role="bold">∀</emphasis>A.<emphasis role="bold">∀</emphasis>B.<emphasis role="bold">∀</emphasis> f:A <emphasis role="bold">→</emphasis> B.<emphasis role="bold">∀</emphasis>x,y:A.eq A x y <emphasis role="bold">→</emphasis> eq B (f y) (f x)</entry>
              </row>
              <row>
               <entry>true</entry>
@@ -242,8 +316,7 @@
             On the contrary, theorem and definitions declared in a file can be
            immediately used without including it.</para>
           <para>The file <command>s</command> is automatically compiled
-           if it is not compiled yet and if it is handled by a
-           <link linkend="developments">development</link>.
+	  if it is not compiled yet.
           </para>
          </listitem>
        </varlistentry>
@@ -270,36 +343,6 @@
      </variablelist>
    </para>
  </sect1>
- <sect1 id="command_set">
-   <title>set</title>
-   <para><userinput>set &quot;baseuri&quot; &quot;s&quot;</userinput></para>
-   <para>
-     <variablelist>
-       <varlistentry>
-         <term>Synopsis:</term>
-         <listitem>
-           <para><emphasis role="bold">set</emphasis> &qstring; &qstring;</para>
-         </listitem>
-       </varlistentry>
-       <varlistentry>
-         <term>Action:</term>
-         <listitem>
-           <para>Sets to <command>s</command> the baseuri of all the
-            theorems and definitions stated in the current file.
-            The baseuri should be <command>a/b/c/foo</command>
-            if the file is named <command>foo</command> and it is in
-            the subtree <command>a/b/c</command> of the current
-            <link linkend="developments">development</link>.
-            This requirement is not enforced, but it could be in the future.
-           </para>
-           <para>Currently, <command>baseuri</command> is the only
-            property that can be set even if the parser accepts
-            arbitrary property names.</para>
-         </listitem>
-       </varlistentry>
-     </variablelist>
-   </para>
- </sect1>
  <sect1 id="command_whelp">
    <title>whelp</title>
    <para><userinput>whelp locate &quot;s&quot;</userinput></para>
@@ -336,7 +379,7 @@
  </sect1>
  <sect1 id="command_qed">
    <title>qed</title>
-   <para><userinput></userinput></para>
+   <para><userinput>qed</userinput></para>
    <para>
      <variablelist>
        <varlistentry>
@@ -358,5 +401,188 @@
      </variablelist>
    </para>
  </sect1>
-</chapter>
+ 
+ <sect1 id="command_inline">
+   <title>inline</title>
+   <para><userinput>inline &quot;s&quot; params</userinput></para>
+   <para>
+     <variablelist>
+       <varlistentry>
+         <term>Synopsis:</term>
+         <listitem>
+           <para>
+	     <emphasis role="bold">inline</emphasis> &qstring; &inlineparams;
+           </para>
+         </listitem>
+       </varlistentry>
+       <varlistentry>
+         <term>Action:</term>
+         <listitem>
+           <para>Inlines a representation of the item <command>s</command>,
+which can be the URI of a HELM object. If an entire HELM directory (i.e. a base
+URI) or the path of a *.ma source file is provided, all the contained objects
+are represented in a row.
+If the inlined object has a proof, this proof is represented in several ways
+depending on the provided parameters.</para>
+         </listitem>
+       </varlistentry>
+     </variablelist>
+   </para>
+   
+    <sect2 id="inline-params">
+    <title>inline-params</title>
+    <table frame="topbot" rowsep="0" colsep="0" role="grammar">
+      <title>inline-params</title>
+      <tgroup cols="4">
+      <tbody>
+       <row>
+	<entry id="grammar.inlineparams">&inlineparams;</entry>
+	<entry>::=</entry>
+        <entry>[&inlineparam; [&inlineparam;] … ]</entry>
+       </row>
+      </tbody>
+     </tgroup>
+    </table>
+    <table frame="topbot" rowsep="0" colsep="0" role="grammar">
+      <title>inline-param</title>
+      <tgroup cols="4">
+      <tbody>
+       
+       <row>
+	<entry id="grammar.inlineparam">&inlineparam;</entry>
+	<entry>::=</entry>
+	<entry><emphasis role="bold">axiom</emphasis></entry>
+        <entry>Try to give an <link linkend="axiom">axiom</link> flavour
+           (bodies are omitted even if present) 
+	</entry>
+       </row>
+
+       <row>
+        <entry/>
+        <entry>|</entry>	
+	<entry><emphasis role="bold">definition</emphasis></entry>
+        <entry>Try give a <link linkend="definition">definition</link> flavour
+	</entry>
+       </row>
+
+       <row>
+        <entry/>
+        <entry>|</entry>	
+	<entry><emphasis role="bold">theorem</emphasis></entry>
+        <entry>Try give a <link linkend="theorem">theorem</link> flavour
+	</entry>
+       </row>
 
+       <row>
+        <entry/>
+        <entry>|</entry>	
+	<entry><emphasis role="bold">lemma</emphasis></entry>
+        <entry>Try give a <link linkend="lemma">lemma</link> flavour
+	</entry>
+       </row>
+
+       <row>
+        <entry/>
+        <entry>|</entry>	
+	<entry><emphasis role="bold">remark</emphasis></entry>
+        <entry>Try give a <link linkend="remark">remark</link> flavour
+	</entry>
+       </row>
+
+       <row>
+        <entry/>
+        <entry>|</entry>	
+	<entry><emphasis role="bold">fact</emphasis></entry>
+        <entry>Try give a <link linkend="fact">fact</link> flavour
+	</entry>
+       </row>
+
+       <row>
+        <entry/>
+        <entry>|</entry>	
+	<entry><emphasis role="bold">variant</emphasis></entry>
+        <entry>Try give a <link linkend="variant">variant</link> flavour
+	       (implies <emphasis role="bold">plain</emphasis>)
+	</entry>
+       </row>
+
+       <row>
+        <entry/>
+        <entry>|</entry>	
+	<entry><emphasis role="bold">declarative</emphasis></entry>
+        <entry>Represent proofs using 
+           <link linkend="sec_declarative_tactics">declarative tactics</link>
+	   (this is the dafault and can be omitted)
+	</entry>
+       </row>
+       
+       <row>
+        <entry/>
+        <entry>|</entry>
+        <entry><emphasis role="bold">procedural</emphasis></entry>
+        <entry>Represent proofs using 
+           <link linkend="sec_tactics">procedural tactics</link>
+       	</entry>
+       </row>
+       
+       <row>
+        <entry/>
+        <entry>|</entry>
+        <entry><emphasis role="bold">plain</emphasis></entry>
+        <entry>Represent proofs using plain 
+	   <link linkend="tbl_terms">proof terms</link>
+	</entry>
+       </row>
+
+       <row>
+        <entry/>
+        <entry>|</entry>
+	<entry><emphasis role="bold">nodefaults</emphasis></entry>
+        <entry>
+	 Do not use the tactics depending on the
+	 <link linkend="command_default">default</link> command
+	   (<link linkend="tac_rewrite">rewrite</link>
+	    in the <emphasis role="bold">procedural</emphasis> mode)
+	</entry>
+       </row>
+
+       <row valign="top">
+        <entry/>
+        <entry>|</entry>
+	<entry><emphasis role="bold">level=&nat;</emphasis></entry>
+        <entry>
+	 Set the level of the procedural proof representation
+	 (the default is the highest level)
+         <itemizedlist>
+          <listitem>
+	   Tactics used at level 1:
+	    <link linkend="tac_exact">exact</link>
+	  </listitem>
+          <listitem>
+	   Additional tactics used at level 2:
+	    <link linkend="tac_letin">letin</link>,
+	    <link linkend="tac_cut">cut</link>,
+	    <link linkend="tac_change">change</link>,
+	    <link linkend="tac_intros">intros</link>,
+	    <link linkend="tac_apply">apply</link>,
+	    <link linkend="tac_elim">elim</link>,
+	    <link linkend="tac_cases">cases</link>,
+	    <link linkend="tac_rewrite">rewrite</link>
+          </listitem>
+         </itemizedlist>
+	</entry>
+       </row>
+
+       <row>
+        <entry/>
+        <entry>|</entry>
+	<entry><emphasis role="bold">depth=&nat;</emphasis></entry>
+        <entry>&TODO;</entry>
+       </row>
+      
+      </tbody>
+     </tgroup>
+    </table>
+    </sect2>   
+ </sect1>
+</chapter>