X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fmatita.lang;h=ea9d318283a14d42ab5ff3283a1eb899815ef7db;hb=376fd7774ef0fa2f30a4afb25aab6158e3cd04b7;hp=bbfcb4ff2487543ddffc199fd77dac18c6d1a925;hpb=b72ec5a3af4c5fd7be09584afb31dd3f0cea3173;p=helm.git

diff --git a/matita/matita/matita.lang b/matita/matita/matita.lang
index bbfcb4ff2..ea9d31828 100644
--- a/matita/matita/matita.lang
+++ b/matita/matita/matita.lang
@@ -54,14 +54,6 @@
 	<context id="character-constant" style-ref="string">
 	  <match>('\%{char-esc}')|('[^\\']')</match>
 	</context>
-	<context id="whelp_macros" style-ref="macros">
-	 <prefix>whelp *</prefix>
-         <keyword>elim</keyword>
-         <keyword>hint</keyword>
-         <keyword>instance</keyword>
-         <keyword>locate</keyword>
-         <keyword>match</keyword>
-	</context>
 	<context id="latex" style-ref="latex">
 	 <prefix>\\</prefix>
          <keyword>def</keyword>
@@ -82,106 +74,20 @@
 	</context>
 	<!-- Flow control & common keywords -->
 	<context id="keywords" style-ref="keyword">
-	 <!-- objects -->
-         <keyword>theorem</keyword>
-         <keyword>definition</keyword>
-         <keyword>lemma</keyword>
-         <keyword>fact</keyword>
-         <keyword>remark</keyword>
-         <keyword>variant</keyword>
-         <keyword>axiom</keyword>
 
-	 <!-- nobjects -->
+	 <!-- objects -->
          <keyword>theorem</keyword>
          <keyword>record</keyword>
          <keyword>definition</keyword>
          <keyword>inductive</keyword>
          <keyword>coinductive</keyword>
          <keyword>let</keyword>
-         <keyword>lemma</keyword>
+         <keyword>fact</keyword>
+	 <keyword>lemma</keyword>
          <keyword>remark</keyword>
          <keyword>axiom</keyword>
 
          <!-- tactics -->
-         <keyword>absurd</keyword>
-         <keyword>apply</keyword>
-         <keyword>applyP</keyword>
-         <keyword>assumption</keyword>
-         <keyword>autobatch</keyword>
-         <keyword>cases</keyword>
-         <keyword>clear</keyword>
-         <keyword>clearbody</keyword>
-         <keyword>change</keyword>
-         <keyword>compose</keyword>
-         <keyword>constructor</keyword>
-         <keyword>contradiction</keyword>
-         <keyword>cut</keyword>
-         <keyword>decompose</keyword>
-         <keyword>destruct</keyword>
-         <keyword>elim</keyword>
-         <keyword>elimType</keyword>
-         <keyword>exact</keyword>
-         <keyword>exists</keyword>
-         <keyword>fail</keyword>
-         <keyword>fold</keyword>
-         <keyword>fourier</keyword>
-         <keyword>fwd</keyword>
-         <keyword>generalize</keyword>
-         <keyword>id</keyword>
-         <keyword>intro</keyword>
-         <keyword>intros</keyword>
-         <keyword>inversion</keyword>
-         <keyword>lapply</keyword>
-         <keyword>linear</keyword>
-         <keyword>left</keyword>
-         <keyword>letin</keyword>
-         <keyword>normalize</keyword>
-         <keyword>reflexivity</keyword>
-         <keyword>replace</keyword>
-         <keyword>rewrite</keyword>
-         <keyword>ring</keyword>
-         <keyword>right</keyword>
-         <keyword>symmetry</keyword>
-         <keyword>simplify</keyword>
-         <keyword>split</keyword>
-         <keyword>to</keyword>
-         <keyword>transitivity</keyword>
-         <keyword>unfold</keyword>
-         <keyword>whd</keyword>
-         <keyword>assume</keyword>
-         <keyword>suppose</keyword>
-         <keyword>by</keyword>
-         <keyword>is</keyword>
-         <keyword>or</keyword>
-         <keyword>equivalent</keyword>
-         <keyword>equivalently</keyword>
-         <keyword>we</keyword> 
-         <keyword>prove</keyword>
-         <keyword>proved</keyword>
-         <keyword>need</keyword>
-         <keyword>proceed</keyword>
-         <keyword>induction</keyword>
-         <keyword>inductive</keyword>
-         <keyword>case</keyword>
-         <keyword>base</keyword>
-         <keyword>let</keyword>
-         <keyword>such</keyword>
-         <keyword>that</keyword>
-         <keyword>by</keyword>
-         <keyword>have</keyword>
-         <keyword>and</keyword>
-         <keyword>the</keyword>
-         <keyword>thesis</keyword>
-         <keyword>becomes</keyword>
-         <keyword>hypothesis</keyword>
-         <keyword>know</keyword>
-         <keyword>case</keyword>	    	 
-         <keyword>obtain</keyword>	    	 
-         <keyword>conclude</keyword>	    	 
-         <keyword>done</keyword>	    	 
-         <keyword>rule</keyword>	    	 
-
-         <!-- ntactics -->
          <keyword>apply</keyword>	    	 
          <keyword>applyS</keyword>	    	 
          <keyword>cases</keyword>	    	 
@@ -203,12 +109,15 @@
           <keyword>alias</keyword>
           <keyword>and</keyword>
           <keyword>as</keyword>
+          <keyword>associative</keyword>
           <keyword>coercion</keyword>
           <keyword>prefer</keyword>
           <keyword>nocomposites</keyword>
           <keyword>coinductive</keyword>
+          <keyword>constraint</keyword>          
           <keyword>corec</keyword>
           <keyword>default</keyword>
+          <keyword>discriminator</keyword>
           <keyword>for</keyword>
           <keyword>include</keyword>
           <keyword>include'</keyword>
@@ -216,22 +125,27 @@
           <keyword>inverter</keyword>
           <keyword>in</keyword>
           <keyword>interpretation</keyword>
+	  <keyword>left</keyword>          
           <keyword>let</keyword>
           <keyword>match</keyword>
           <keyword>names</keyword>
-          <keyword>notation</keyword>
+	  <keyword>non</keyword>          
+	  <keyword>notation</keyword>
           <keyword>on</keyword>
+          <keyword>precedence</keyword>
           <keyword>qed</keyword>
           <keyword>rec</keyword>
           <keyword>record</keyword>
           <keyword>return</keyword>
+	  <keyword>right</keyword>          
           <keyword>source</keyword>    
           <keyword>to</keyword>
-          <keyword>using</keyword>
+          <keyword>universe</keyword>          
+	  <keyword>using</keyword>
           <keyword>with</keyword>
          
          
-          <!-- ncommands -->
+          <!-- commands -->
           <keyword>unification</keyword>
           <keyword>hint</keyword>
           <keyword>coercion</keyword>
@@ -239,21 +153,15 @@
           <keyword>qed</keyword>
 
           <!-- macros -->
-          <keyword>inline</keyword>
-          <keyword>procedural</keyword>
           <keyword>check</keyword>
           <keyword>eval</keyword>
           <keyword>hint</keyword>
           <keyword>set</keyword>
           <keyword>auto</keyword>
-          <keyword>odefaults</keyword>
+          <keyword>nodefaults</keyword>
           <keyword>coercions</keyword>
           <keyword>comments</keyword>
           <keyword>debug</keyword>
-          <keyword>cr</keyword>
-         
-          <!-- nmacros -->
-          <keyword>check</keyword>
          
           <!-- tinycals -->
           <keyword>try</keyword>
@@ -268,12 +176,6 @@
 	</context>
 	<context id="types" style-ref="type">
 	  <!-- sorts -->
-          <keyword>Set</keyword>
-          <keyword>Prop</keyword>
-          <keyword>Type</keyword>
-          <keyword>CProp</keyword>
-
-	  <!-- nsorts -->
           <keyword>Prop</keyword>
           <keyword>Type[0]</keyword>
           <keyword>CProp[0]</keyword>
@@ -287,7 +189,7 @@
           <match>∀|∃|λ|=|→|⇒|…|≝|≡|\?</match>
         </context>
         <context id="tinycals" style-ref="tinycals">
-		<match>\[|\||\]|\{|\}|>|//|&lt;|@|\$|#|\\\\|;|\.|:>|:</match>
+		<match>\[|\||\]|\{|\}|>|//|&lt;|@|\$|#|\\\\|;|\.|:>|:|-</match>
         </context>
       </include>
     </context>