X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fmatita.lang;h=6a24b9aed1089ab85ef68df919e1635d54850676;hb=bac3136bf99a18374b91e1ec900e455567e8f741;hp=1e2f0e57c70711b1dd61d6c38852b0610b1b03a5;hpb=9c9e979d4c45cf3b1ee01688b2c36fe49190ce98;p=helm.git

diff --git a/helm/software/matita/matita.lang b/helm/software/matita/matita.lang
index 1e2f0e57c..6a24b9aed 100644
--- a/helm/software/matita/matita.lang
+++ b/helm/software/matita/matita.lang
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
 <language _name="grafite" version="1.0" _section="Sources" mimetypes="text/x-matita">
 
   <escape-char>\</escape-char>
 
+  <block-comment _name = "Commented Code" style = "Comment">
+    <start-regex>\(\*\*[^\)]</start-regex>
+    <end-regex>[^\(]\*\)</end-regex>
+  </block-comment>
+
   <block-comment _name = "Block Comment" style = "Comment">
     <start-regex>\(\*</start-regex>
     <end-regex>\*\)</end-regex>
   </block-comment>
-  
-  <block-comment _name = "Commented Code" style = "Comment">
-    <start-regex>\(\*\*</start-regex>
-    <end-regex>\*\*\)</end-regex>
-  </block-comment>
 
   <keyword-list _name = "Theorem Kinds" style = "Keyword" case-sensitive="TRUE">
     <keyword>theorem</keyword>
@@ -23,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>
@@ -36,6 +48,7 @@
     <keyword>include</keyword>
     <keyword>include'</keyword>
     <keyword>inductive</keyword>
+    <keyword>inverter</keyword>
     <keyword>in</keyword>
     <keyword>interpretation</keyword>
     <keyword>let</keyword>
@@ -47,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>
@@ -78,22 +100,35 @@
     <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>
     <keyword>decompose</keyword>
-    <keyword>discriminate</keyword>
+    <keyword>destruct</keyword>
     <keyword>elim</keyword>
     <keyword>elimType</keyword>
     <keyword>exact</keyword>
@@ -103,17 +138,15 @@
     <keyword>fourier</keyword>
     <keyword>fwd</keyword>
     <keyword>generalize</keyword>
-    <keyword>goal</keyword>
     <keyword>id</keyword>
-    <keyword>injection</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>reduce</keyword>
     <keyword>reflexivity</keyword>
     <keyword>replace</keyword>
     <keyword>rewrite</keyword>
@@ -126,7 +159,55 @@
     <keyword>transitivity</keyword>
     <keyword>unfold</keyword>
     <keyword>whd</keyword>
-  </keyword-list>
+    <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>	    	 
+</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">
     <keyword>try</keyword>
@@ -134,15 +215,30 @@
     <keyword>do</keyword>
     <keyword>repeat</keyword>
     <keyword>first</keyword>
+    <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>print</keyword>
+    <keyword>inline</keyword>
+    <keyword>procedural</keyword>
     <keyword>check</keyword>
+    <keyword>eval</keyword>
     <keyword>hint</keyword>
-    <keyword>quit</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"