New syntax for auto-related tactics and conclude/obtain.

diff --git a/helm/software/matita/help/C/declarative_tactics_quickref.xml b/helm/software/matita/help/C/declarative_tactics_quickref.xml
index 2d09883af5b7647b6218fcf0788a5e6ceb0652ac..8aba5a08c16c4a073a9c0bfdb6817e3c6b94049c 100644 (file)
--- a/helm/software/matita/help/C/declarative_tactics_quickref.xml
+++ b/helm/software/matita/help/C/declarative_tactics_quickref.xml
@@ -48,7 +48,7 @@
       <row>
         <entry/>
         <entry>|</entry>
-        <entry>[<emphasis role="bold">obtain</emphasis> <emphasis><link linkend="grammar.id">id</link></emphasis> | <emphasis role="bold">conclude</emphasis> <emphasis><link linkend="grammar.term">term</link></emphasis>] <emphasis role="bold">=</emphasis> <emphasis><link linkend="grammar.term">term</link></emphasis> <emphasis role="bold">by</emphasis> [ <emphasis><link linkend="grammar.term">term</link></emphasis> | <emphasis role="bold">_</emphasis> [<emphasis role="bold">(</emphasis><emphasis><link linkend="grammar.autoparams">auto_params</link></emphasis><emphasis role="bold">)</emphasis>]] [<emphasis role="bold">done</emphasis>]</entry>
+        <entry>[<emphasis role="bold">obtain</emphasis> <emphasis><link linkend="grammar.id">id</link></emphasis> | <emphasis role="bold">conclude</emphasis> <emphasis><link linkend="grammar.term">term</link></emphasis>] <emphasis role="bold">=</emphasis> <emphasis><link linkend="grammar.term">term</link></emphasis> [<emphasis><link linkend="grammar.autoparams">auto_params</link></emphasis> | <emphasis role="bold">exact</emphasis> <emphasis><link linkend="grammar.term">term</link></emphasis> | <emphasis role="bold">using</emphasis> <emphasis><link linkend="grammar.term">term</link></emphasis> | <emphasis role="bold">proof</emphasis>] [<emphasis role="bold">done</emphasis>]</entry>
       </row>
       <row>
         <entry/>

diff --git a/helm/software/matita/help/C/matita.xml b/helm/software/matita/help/C/matita.xml
index 30d37b3ba45e2fabdae3b4f2f7b76cc53a574abd..1b4cba2aa479364e54f2a5d66db497702c8b4732 100644 (file)
--- a/helm/software/matita/help/C/matita.xml
+++ b/helm/software/matita/help/C/matita.xml
@@ -53,6 +53,7 @@
   <!ENTITY qstring "<emphasis><link linkend='grammar.qstring'>qstring</link></emphasis>">
   <!ENTITY interpretation "<emphasis><link linkend='grammar.interpretation'>interpretation</link></emphasis>">
   <!ENTITY autoparams "<emphasis><link linkend='grammar.autoparams'>auto_params</link></emphasis>">
+  <!ENTITY simpleautoparam "<emphasis><link linkend='grammar.simpleautoparam'>simple_auto_param</link></emphasis>">
 ]>
 
 <?yelp:chunk-depth 3?>

diff --git a/helm/software/matita/help/C/sec_declarative_tactics.xml b/helm/software/matita/help/C/sec_declarative_tactics.xml
index b8b8777791660d7dda447dd266b6f0a1b51cc864..cc6aeb61de2ae497fff42a6b7ad44909d693baf2 100644 (file)
--- a/helm/software/matita/help/C/sec_declarative_tactics.xml
+++ b/helm/software/matita/help/C/sec_declarative_tactics.xml
@@ -67,13 +67,13 @@
       <varlistentry>
          <term>Pre-condition:</term>
         <listitem>
-          <para> Da Fare </para>
+          <para> &TODO; </para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term>Action:</term>
          <listitem>
-           <para> Da Fare </para>
+           <para> &TODO; </para>
          </listitem>
       </varlistentry>
       <varlistentry>
@@ -135,13 +135,13 @@
         <varlistentry>
           <term>Pre-condition:</term>
          <listitem>
-           <para> Da Fare </para>
+           <para> &TODO; </para>
          </listitem>
         </varlistentry>
         <varlistentry>
           <term>Action:</term>
            <listitem>
-             <para> Da Fare </para>
+             <para> &TODO; </para>
            </listitem>
         </varlistentry>
         <varlistentry>
@@ -203,13 +203,13 @@
          <varlistentry>
            <term>Pre-condition:</term>
            <listitem>
-             <para> Da Fare </para>
+             <para> &TODO; </para>
            </listitem>
          </varlistentry>
          <varlistentry>
            <term>Action:</term>
              <listitem>
-               <para> Da Fare </para>
+               <para> &TODO; </para>
               </listitem>
          </varlistentry>
           <varlistentry>
@@ -237,13 +237,13 @@
          <varlistentry>
            <term>Pre-condition:</term>
            <listitem>
-             <para> Da Fare </para>
+             <para> &TODO; </para>
            </listitem>
          </varlistentry>
          <varlistentry>
            <term>Action:</term>
              <listitem>
-               <para> Da Fare </para>
+               <para> &TODO; </para>
              </listitem>
          </varlistentry>
           <varlistentry>
@@ -305,19 +305,19 @@
          <varlistentry>
             <term>Pre-condition:</term>
            <listitem>
-               <para> Da Fare </para>
+               <para> &TODO; </para>
            </listitem>
         </varlistentry>
          <varlistentry>
             <term>Action:</term>
             <listitem>
-              <para> Da Fare </para>
+              <para> &TODO; </para>
             </listitem>
          </varlistentry>
          <varlistentry>
            <term>New sequents to prove:</term>
            <listitem>
-               <para>Da Fare</para>
+               <para>&TODO;</para>
            </listitem>
          </varlistentry>
        </variablelist>
@@ -327,31 +327,31 @@
   <sect1 id="tac_obtain">
     <title>obtain/conclude</title>
     <titleabbrev>obtain/conclude</titleabbrev>
-    <para><userinput>obtain H t=t by [t|_] done</userinput></para>
+    <para><userinput>obtain H t=t [auto_params | exact t| proof | using t] done</userinput></para>
     <para>
       <variablelist>
          <varlistentry role="tactic.synopsis">
           <term>Synopsis:</term>
           <listitem>
-            <para>[<emphasis role="bold">obtain</emphasis> &id; | <emphasis role="bold">conclude</emphasis> &term;] <emphasis role="bold">=</emphasis> &term; <emphasis role="bold">by</emphasis> [ &term; | <emphasis role="bold">_</emphasis> [<emphasis role="bold">(</emphasis>&autoparams;<emphasis role="bold">)</emphasis>]] [<emphasis role="bold">done</emphasis>]</para>
+            <para>[<emphasis role="bold">obtain</emphasis> &id; | <emphasis role="bold">conclude</emphasis> &term;] <emphasis role="bold">=</emphasis> &term; [&autoparams; | <emphasis role="bold">exact</emphasis> &term; | <emphasis role="bold">using</emphasis> &term; | <emphasis role="bold">proof</emphasis>] [<emphasis role="bold">done</emphasis>]</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>Pre-condition:</term>
             <listitem>
-              <para> Da Fare </para>
+              <para> &TODO; </para>
             </listitem>
         </varlistentry>
         <varlistentry>
           <term>Action:</term>
           <listitem>
-             <para> Da Fare </para>
+             <para> &TODO; </para>
            </listitem>
          </varlistentry>
         <varlistentry>
           <term>New sequence to prove:</term>
             <listitem>
-               <para> Da Fare </para>
+               <para> &TODO; </para>
             </listitem>
         </varlistentry>
        </variablelist>
@@ -387,7 +387,7 @@
           <varlistentry>
             <term>New sequence to prove:</term>
             <listitem>
-              <para> Da fare </para>
+              <para> &TODO; </para>
             </listitem>
           </varlistentry>
         </variablelist>

diff --git a/helm/software/matita/help/C/sec_tactics.xml b/helm/software/matita/help/C/sec_tactics.xml
index bdfb3e5db83f5a4d9dc98bc7c7a880f89130684a..7647232613daff64928d14d507f7d120439f736e 100644 (file)
--- a/helm/software/matita/help/C/sec_tactics.xml
+++ b/helm/software/matita/help/C/sec_tactics.xml
@@ -597,13 +597,13 @@
   <sect1 id="tac_demodulate">
     <title>demodulate</title>
     <titleabbrev>demodulate</titleabbrev>
-    <para><userinput>demodulate</userinput></para>
+    <para><userinput>demodulate auto_params</userinput></para>
     <para>
       <variablelist>
         <varlistentry role="tactic.synopsis">
           <term>Synopsis:</term>
           <listitem>
-            <para><emphasis role="bold">demodulate</emphasis></para>
+            <para><emphasis role="bold">demodulate</emphasis> &autoparams;</para>
           </listitem>
         </varlistentry>
         <varlistentry>

diff --git a/helm/software/matita/help/C/sec_terms.xml b/helm/software/matita/help/C/sec_terms.xml
index 3cae2f84c1866ad13d858e14eb32953176c38c13..15793c63acb9e71b45b1d8065a64a05623f390ec 100644 (file)
--- a/helm/software/matita/help/C/sec_terms.xml
+++ b/helm/software/matita/help/C/sec_terms.xml
@@ -729,12 +729,28 @@
     <title>auto-params</title>
     <para>&TODO;</para>
     <table frame="topbot" rowsep="0" colsep="0" role="grammar">
-      <title>reduction-kind</title>
+      <title>auto-params</title>
       <tgroup cols="4">
       <tbody>
        <row>
        <entry id="grammar.autoparams">&autoparams;</entry>
        <entry>::=</entry>
+        <entry>[&simpleautoparam;]…
+               [<emphasis role="bold">by</emphasis>
+                &term; [&term;]…]
+        </entry>
+        <entry>&TODO;</entry>
+       </row>
+      </tbody>
+     </tgroup>
+    </table>
+    <table frame="topbot" rowsep="0" colsep="0" role="grammar">
+      <title>simple-auto-param</title>
+      <tgroup cols="4">
+      <tbody>
+       <row>
+       <entry id="grammar.simpleautoparam">&simpleautoparam;</entry>
+       <entry>::=</entry>
         <entry><emphasis role="bold">depth=&nat;</emphasis></entry>
         <entry>&TODO;</entry>
        </row>

diff --git a/helm/software/matita/help/C/tactics_quickref.xml b/helm/software/matita/help/C/tactics_quickref.xml
index e6f2e2f794b1ac4b787cbae1ff4d295fe93e74b1..331d58dc2902b94461ed3d40d85b2c38d689e663 100644 (file)
--- a/helm/software/matita/help/C/tactics_quickref.xml
+++ b/helm/software/matita/help/C/tactics_quickref.xml
@@ -92,11 +92,7 @@
       <row>
         <entry/>
         <entry>|</entry>
-        <entry>
-          <link linkend="tac_demodulate">
-            <emphasis role="bold">demodulate</emphasis>
-          </link>
-        </entry>
+        <entry><link linkend="tac_demodulate"><emphasis role="bold">demodulate</emphasis></link> <emphasis><link linkend="grammar.autoparams">auto_params</link></emphasis></entry>
       </row>
       <row>
         <entry/>
@@ -218,11 +214,6 @@
         <entry>|</entry>
         <entry><link linkend="tac_normalize"><emphasis role="bold">normalize</emphasis></link> <emphasis><link linkend="grammar.pattern">pattern</link></emphasis></entry>
       </row>
-      <row>
-        <entry/>
-        <entry>|</entry>
-        <entry><link linkend="tac_reduce"><emphasis role="bold">reduce</emphasis></link> <emphasis><link linkend="grammar.pattern">pattern</link></emphasis></entry>
-      </row>
       <row>
         <entry/>
         <entry>|</entry>