X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fmatita.lang;h=6a24b9aed1089ab85ef68df919e1635d54850676;hb=c6c248e635ef35e9515ed981374ce2a0cef30e62;hp=f657ccbf166969fcc5e8816100574709e17fd0a6;hpb=36014ac060f150e7d93f607c914a0b06239715c0;p=helm.git

diff --git a/helm/software/matita/matita.lang b/helm/software/matita/matita.lang
index f657ccbf1..6a24b9aed 100644
--- a/helm/software/matita/matita.lang
+++ b/helm/software/matita/matita.lang
@@ -5,7 +5,7 @@
 
   <block-comment _name = "Commented Code" style = "Comment">
     <start-regex>\(\*\*[^\)]</start-regex>
-    <end-regex>[^\(]\*\*\)</end-regex>
+    <end-regex>[^\(]\*\)</end-regex>
   </block-comment>
 
   <block-comment _name = "Block Comment" style = "Comment">
@@ -22,12 +22,25 @@
     <keyword>variant</keyword>
     <keyword>axiom</keyword>
   </keyword-list>
+
+  <keyword-list _name = "NTheorem Kinds" style = "Keyword" case-sensitive="TRUE">
+    <keyword>ntheorem</keyword>
+    <keyword>nrecord</keyword>
+    <keyword>ndefinition</keyword>
+    <keyword>ninductive</keyword>
+    <keyword>ncoinductive</keyword>
+    <keyword>nlet</keyword>
+    <keyword>nlemma</keyword>
+    <keyword>naxiom</keyword>
+  </keyword-list>
     
   <keyword-list _name = "Commands" style = "Keyword" case-sensitive="TRUE">
     <keyword>alias</keyword>
     <keyword>and</keyword>
     <keyword>as</keyword>
     <keyword>coercion</keyword>
+    <keyword>prefer</keyword>
+    <keyword>nocomposites</keyword>
     <keyword>coinductive</keyword>
     <keyword>corec</keyword>
     <keyword>default</keyword>
@@ -35,6 +48,7 @@
     <keyword>include</keyword>
     <keyword>include'</keyword>
     <keyword>inductive</keyword>
+    <keyword>inverter</keyword>
     <keyword>in</keyword>
     <keyword>interpretation</keyword>
     <keyword>let</keyword>
@@ -46,11 +60,20 @@
     <keyword>rec</keyword>
     <keyword>record</keyword>
     <keyword>return</keyword>
+    <keyword>source</keyword>    
     <keyword>to</keyword>
     <keyword>using</keyword>
     <keyword>with</keyword>
   </keyword-list>
 
+  <keyword-list _name = "NCommands" style = "Keyword" case-sensitive="TRUE">
+    <keyword>unification</keyword>
+    <keyword>hint</keyword>
+    <keyword>ncoercion</keyword>
+    <keyword>ninverter</keyword>
+    <keyword>nqed</keyword>
+  </keyword-list>
+
   <pattern-item _name = "Command [" style = "Keyword">
     <regex>\[</regex>
   </pattern-item>
@@ -77,17 +100,30 @@
     <keyword>Set</keyword>
     <keyword>Prop</keyword>
     <keyword>Type</keyword>
+    <keyword>CProp</keyword>
+  </keyword-list>
+
+  <keyword-list _name = "NSorts" style = "Data Type" case-sensitive="TRUE">
+    <keyword>Prop</keyword>
+    <keyword>Type[0]</keyword>
+    <keyword>CProp[0]</keyword>
+    <keyword>Type[1]</keyword>
+    <keyword>CProp[1]</keyword>
+    <keyword>Type[2]</keyword>
+    <keyword>CProp[2]</keyword>
   </keyword-list>
 
   <keyword-list _name = "Tactics" style = "Others 2" case-sensitive="TRUE">
     <keyword>absurd</keyword>
     <keyword>apply</keyword>
+    <keyword>applyP</keyword>
     <keyword>assumption</keyword>
-    <keyword>auto</keyword>
-    <keyword>paramodulation</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>
@@ -102,7 +138,6 @@
     <keyword>fourier</keyword>
     <keyword>fwd</keyword>
     <keyword>generalize</keyword>
-    <keyword>goal</keyword>
     <keyword>id</keyword>
     <keyword>intro</keyword>
     <keyword>intros</keyword>
@@ -112,7 +147,6 @@
     <keyword>left</keyword>
     <keyword>letin</keyword>
     <keyword>normalize</keyword>
-    <keyword>reduce</keyword>
     <keyword>reflexivity</keyword>
     <keyword>replace</keyword>
     <keyword>rewrite</keyword>
@@ -121,7 +155,6 @@
     <keyword>symmetry</keyword>
     <keyword>simplify</keyword>
     <keyword>split</keyword>
-    <keyword>subst</keyword>
     <keyword>to</keyword>
     <keyword>transitivity</keyword>
     <keyword>unfold</keyword>
@@ -157,6 +190,23 @@
     <keyword>obtain</keyword>	    	 
     <keyword>conclude</keyword>	    	 
     <keyword>done</keyword>	    	 
+    <keyword>rule</keyword>	    	 
+</keyword-list>
+
+<keyword-list _name = "NTactics" style = "Others 2" case-sensitive="TRUE">
+    <keyword>napply</keyword>	    	 
+    <keyword>ncases</keyword>	    	 
+    <keyword>nletin</keyword>	    	 
+    <keyword>nauto</keyword>	    	 
+    <keyword>nelim</keyword>	    	 
+    <keyword>nwhd</keyword>	    	 
+    <keyword>nnormalize</keyword>	    	 
+    <keyword>nassumption</keyword>	    	 
+    <keyword>ngeneralize</keyword>	    	 
+    <keyword>nchange</keyword>	    	 
+    <keyword>nrewrite</keyword>	    	 
+    <keyword>ncut</keyword>	    	 
+    <keyword>nlapply</keyword>	    	 
 </keyword-list>
 
   <keyword-list _name = "Tacticals" style = "Keyword" case-sensitive="TRUE">
@@ -168,14 +218,27 @@
     <keyword>focus</keyword>
     <keyword>unfocus</keyword>
     <keyword>progress</keyword>
+    <keyword>skip</keyword>
   </keyword-list>
 
 
   <keyword-list _name = "Matita Macro" style = "Others 3" case-sensitive="TRUE">
     <keyword>inline</keyword>
+    <keyword>procedural</keyword>
     <keyword>check</keyword>
+    <keyword>eval</keyword>
     <keyword>hint</keyword>
     <keyword>set</keyword>
+    <keyword>auto</keyword>
+    <keyword>nodefaults</keyword>
+    <keyword>coercions</keyword>
+    <keyword>comments</keyword>
+    <keyword>debug</keyword>
+    <keyword>cr</keyword>
+  </keyword-list>
+
+  <keyword-list _name = "NMacro" style = "Others 3" case-sensitive="TRUE">
+    <keyword>ncheck</keyword>
   </keyword-list>
   
   <keyword-list _name = "Whelp Macro" style = "Others 3"