X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fmatita.lang;h=2ba1967a06e5aaaa6b176ff6ad05398bf929650a;hb=d97886196d2c730f72312b226bebc388be08f39e;hp=0c181ee4480269bf55ec473df745108fc03e825e;hpb=55b82bd235d82ff7f0a40d980effe1efde1f5073;p=helm.git

diff --git a/helm/software/matita/matita.lang b/helm/software/matita/matita.lang
index 0c181ee44..2ba1967a0 100644
--- a/helm/software/matita/matita.lang
+++ b/helm/software/matita/matita.lang
@@ -1,186 +1,292 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<language _name="grafite" version="1.0" _section="Sources" mimetypes="text/x-matita">
+<language id="grafite" _name="grafite" version="2.0" _section="Sources">
+  <metadata>
+    <property name="mimetypes">text/x-matita</property>
+    <property name="globs">*.ma</property>
+    <property name="block-comment-start">(*</property>
+    <property name="block-comment-end">*)</property>
+  </metadata>
 
-  <escape-char>\</escape-char>
+  <styles>
+    <style id="comment" _name="Comment" map-to="def:comment"/>
+    <style id="string" _name="String" map-to="def:string"/>
+    <style id="escape" _name="Escape" map-to="def:string"/>
+    <style id="keyword" _name="Keyword" map-to="def:keyword"/>
+    <style id="type" _name="Data Type" map-to="def:type"/>
+    <style id="latex" _name="LaTeX Escaped" map-to="def:special-char"/>
+    <style id="macros" _name="Macros" map-to="def:keyword"/>
+    <style id="tinycals" _name="Tinycals" map-to="def:keyword"/>
+    <style id="quantifiers" _name="Quantifiers" map-to="def:type"/>
+  </styles>
 
-  <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>
+  <definitions>
+    <define-regex id="char-esc">\\"|[0-9a-zA-Z]</define-regex>
+    <context id="escape-seq" style-ref="escape">
+      <match>\%{char-esc}</match>
+    </context>
+    <!-- here's the main context -->
+    <context id="grafite">
+      <include>
+	<context id="comment" style-ref="comment">
+	  <start>\(\*</start>
+	  <end>\*\)</end>
+	  <include>
+	    <context ref="string"/>
+	    <context id="comment-in-comment" style-ref="comment">
+	      <start>\(\*</start>
+	      <end>\*\)</end>
+	      <include>
+		<context ref="string"/>
+		<context ref="comment-in-comment"/>
+		<context ref="def:in-comment:*"/>
+	      </include>
+	    </context>
+	    <context ref="def:in-comment:*"/>
+	  </include>
+	</context>
+	<context id="string" style-ref="string">
+	  <start>"</start>
+	  <end>"</end>
+	  <include>
+	    <context ref="escape-seq"/>
+	  </include>
+	</context>
+	<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>
+         <keyword>forall</keyword>
+         <keyword>lambda</keyword>
+         <keyword>to</keyword>
+         <keyword>exists</keyword>
+         <keyword>Rightarrow</keyword>
+         <keyword>Assign</keyword>
+         <keyword>land</keyword>
+         <keyword>lor</keyword>
+         <keyword>lnot</keyword>
+         <keyword>liff</keyword>
+         <keyword>subst</keyword>
+         <keyword>vdash</keyword>
+         <keyword>iforall</keyword>
+         <keyword>iexists</keyword>
+	</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>
 
-  <keyword-list _name = "Theorem Kinds" style = "Keyword" case-sensitive="TRUE">
-    <keyword>theorem</keyword>
-    <keyword>definition</keyword>
-    <keyword>lemma</keyword>
-    <keyword>fact</keyword>
-    <keyword>remark</keyword>
-    <keyword>variant</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>coinductive</keyword>
-    <keyword>corec</keyword>
-    <keyword>default</keyword>
-    <keyword>for</keyword>
-    <keyword>include</keyword>
-    <keyword>inductive</keyword>
-    <keyword>in</keyword>
-    <keyword>interpretation</keyword>
-    <keyword>let</keyword>
-    <keyword>match</keyword>
-    <keyword>names</keyword>
-    <keyword>notation</keyword>
-    <keyword>on</keyword>
-    <keyword>qed</keyword>
-    <keyword>rec</keyword>
-    <keyword>record</keyword>
-    <keyword>return</keyword>
-    <keyword>to</keyword>
-    <keyword>using</keyword>
-    <keyword>with</keyword>
-  </keyword-list>
+	 <!-- nobjects -->
+         <keyword>ntheorem</keyword>
+         <keyword>nrecord</keyword>
+         <keyword>ndefinition</keyword>
+         <keyword>ninductive</keyword>
+         <keyword>ncoinductive</keyword>
+         <keyword>nlet</keyword>
+         <keyword>nlemma</keyword>
+         <keyword>naxiom</keyword>
 
-  <pattern-item _name = "Command [" style = "Keyword">
-    <regex>\[</regex>
-  </pattern-item>
-  <pattern-item _name = "Command |" style = "Keyword">
-    <regex>\|</regex>
-  </pattern-item>
-  <pattern-item _name = "Command ]" style = "Keyword">
-    <regex>\]</regex>
-  </pattern-item>
-  <pattern-item _name = "Command {" style = "Keyword">
-    <regex>\{</regex>
-  </pattern-item>
-  <pattern-item _name = "Command }" style = "Keyword">
-    <regex>\}</regex>
-  </pattern-item>
-  <pattern-item _name = "Notation ast mark" style = "Keyword">
-    <regex>@</regex>
-  </pattern-item>
-  <pattern-item _name = "Notation meta mark" style = "Keyword">
-    <regex>\$</regex>
-  </pattern-item>
+         <!-- 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>	    	 
 
-  <keyword-list _name = "Sorts" style = "Data Type" case-sensitive="TRUE">
-    <keyword>Set</keyword>
-    <keyword>Prop</keyword>
-    <keyword>Type</keyword>
-  </keyword-list>
+         <!-- ntactics -->
+         <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>ndestruct</keyword> 
 
-  <keyword-list _name = "Tactics" style = "Others 2" case-sensitive="TRUE">
-    <keyword>absurd</keyword>
-    <keyword>apply</keyword>
-    <keyword>assumption</keyword>
-    <keyword>auto</keyword>
-    <keyword>paramodulation</keyword>
-    <keyword>clear</keyword>
-    <keyword>clearbody</keyword>
-    <keyword>change</keyword>
-    <keyword>compare</keyword>
-    <keyword>constructor</keyword>
-    <keyword>contradiction</keyword>
-    <keyword>cut</keyword>
-    <keyword>decide</keyword> <keyword>equality</keyword> <!-- CSC: ??? -->
-    <keyword>decompose</keyword>
-    <keyword>discriminate</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>goal</keyword>
-    <keyword>id</keyword>
-    <keyword>injection</keyword>
-    <keyword>intro</keyword>
-    <keyword>intros</keyword>
-    <keyword>lapply</keyword>
-    <keyword>left</keyword>
-    <keyword>letin</keyword>
-    <keyword>normalize</keyword>
-    <keyword>reduce</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-list>
+          <!-- commands -->
+          <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>
+          <keyword>for</keyword>
+          <keyword>include</keyword>
+          <keyword>include'</keyword>
+          <keyword>inductive</keyword>
+          <keyword>inverter</keyword>
+          <keyword>in</keyword>
+          <keyword>interpretation</keyword>
+          <keyword>let</keyword>
+          <keyword>match</keyword>
+          <keyword>names</keyword>
+          <keyword>notation</keyword>
+          <keyword>on</keyword>
+          <keyword>qed</keyword>
+          <keyword>rec</keyword>
+          <keyword>record</keyword>
+          <keyword>return</keyword>
+          <keyword>source</keyword>    
+          <keyword>to</keyword>
+          <keyword>using</keyword>
+          <keyword>with</keyword>
+         
+         
+          <!-- ncommands -->
+          <keyword>unification</keyword>
+          <keyword>hint</keyword>
+          <keyword>ncoercion</keyword>
+          <keyword>ninverter</keyword>
+          <keyword>nqed</keyword>
 
-  <keyword-list _name = "Tacticals" style = "Keyword" case-sensitive="TRUE">
-    <keyword>try</keyword>
-    <keyword>solve</keyword>
-    <keyword>do</keyword>
-    <keyword>repeat</keyword>
-    <keyword>first</keyword>
-  </keyword-list>
+          <!-- macros -->
+          <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>
+         
+          <!-- nmacros -->
+          <keyword>ncheck</keyword>
+         
+          <!-- tinycals -->
+          <keyword>try</keyword>
+          <keyword>solve</keyword>
+          <keyword>do</keyword>
+          <keyword>repeat</keyword>
+          <keyword>first</keyword>
+          <keyword>focus</keyword>
+          <keyword>unfocus</keyword>
+          <keyword>progress</keyword>
+          <keyword>skip</keyword>
+	</context>
+	<context id="types" style-ref="type">
+	  <!-- sorts -->
+          <keyword>Set</keyword>
+          <keyword>Prop</keyword>
+          <keyword>Type</keyword>
+          <keyword>CProp</keyword>
 
-
-  <keyword-list _name = "Matita Macro" style = "Others 3" case-sensitive="TRUE">
-    <keyword>print</keyword>
-    <keyword>check</keyword>
-    <keyword>hint</keyword>
-    <keyword>quit</keyword>
-    <keyword>set</keyword>
-  </keyword-list>
-  
-  <keyword-list _name = "Whelp Macro" style = "Others 3"
-    case-sensitive="TRUE" 
-    beginning-regex="whelp *" 
-    match-empty-string-at-beginning="FALSE"
-    match-empty-string-at-end="FALSE" >
-    <keyword>elim</keyword>
-    <keyword>hint</keyword>
-    <keyword>instance</keyword>
-    <keyword>locate</keyword>
-    <keyword>match</keyword>
-  </keyword-list>
-    
-  <keyword-list _name = "TeX Macro" style = "Preprocessor" 
-    case-sensitive="TRUE" 
-    beginning-regex="\\" 
-    match-empty-string-at-beginning="FALSE"
-    match-empty-string-at-end="FALSE" >
-     <keyword>def</keyword>
-     <keyword>forall</keyword>
-     <keyword>lambda</keyword>
-     <keyword>to</keyword>
-     <keyword>exists</keyword>
-     <keyword>Rightarrow</keyword>
-     <keyword>Assign</keyword>
-     <keyword>land</keyword>
-     <keyword>lor</keyword>
-     <keyword>lnot</keyword>
-     <keyword>liff</keyword>
-     <keyword>subst</keyword>
-     <keyword>vdash</keyword>
-     <keyword>iforall</keyword>
-     <keyword>iexists</keyword>
-  </keyword-list>
-
-  <string _name = "String" style = "String" >
-    <start-regex>&quot;</start-regex>
-    <end-regex>&quot;</end-regex>
-  </string>
- 
+	  <!-- nsorts -->
+          <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>
+	</context>
+        <context id="quantifiers" style-ref="quantifiers">
+          <!-- quantifiers -->
+          <match>∀|∃|λ|=|→|⇒|…|≝|≡|\?</match>
+        </context>
+        <context id="tinycals" style-ref="tinycals">
+          <match>\[|\||\]|\{|\}|@|\$|#|\\\\|;|\.|:>|:</match>
+        </context>
+      </include>
+    </context>
+  </definitions>
 </language>