Improved

diff --git a/helm/software/matita/matita.lang b/helm/software/matita/matita.lang
index a1d578b6d1c0f4dd91e085b9e47cf14c847ae44c..f4e3e13810225855546db7b21322af022dcff073 100644 (file)
--- a/helm/software/matita/matita.lang
+++ b/helm/software/matita/matita.lang
@@ -13,6 +13,8 @@
     <style id="string" _name="String" 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="escape" _name="Escaped Character" map-to="def:special-char"/>
   </styles>
 
@@ -53,6 +55,32 @@
        <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 -->
@@ -278,40 +306,5 @@
   <pattern-item _name = "Notation meta mark" style = "Keyword">
     <regex>\$</regex>
   </pattern-item>
-
-
-  <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>
   -->
 </language>