synced with upstream

moo/mooedit/langs/cobalt.xml

@@ -128,7 +128,7 @@
   <!-- XML Styles -->
   <style name="xml:attribute-name"          foreground="light_grey"/>
   <style name="xml:element-name"            foreground="teal_blue"/>
-  <style name="xml:entity"                  foreground="blue"/>
+  <style name="xml:entity"                  foreground="#blue"/>
   <style name="xml:processing-instruction"  bold="true"/>
 
 </style-scheme>

moo/mooedit/langs/eiffel.lang

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
- Author: Hasan Karahan <hasan.karahan81@gmail.com>
+ Author: Hasan Karahan <hasan.karahan81@gmail.com>, updated by Remi Meier
  Copyright (C) 2008 Hasan Karahan <hasan.karahan81@gmail.com>
 
  This library is free software; you can redistribute it and/or
@@ -20,7 +20,6 @@
  Boston, MA 02111-1307, USA.
 
 -->
-
 <language id="eiffel" _name="Eiffel" version="2.0" _section="Sources">
 
   <metadata>
@@ -39,13 +38,14 @@
     <style id="design-by-contract" _name="Design by Contract" map-to="def:keyword"/>
     <style id="exception-handling" _name="Exception Handling" map-to="def:keyword"/>
     <style id="predefined-variable" _name="Predefined Variable" map-to="def:builtin"/>
+    <style id="escaped-character" _name="Escaped Character" map-to="def:special-char"/>
     <style id="void" _name="Void Value" map-to="def:special-constant"/>
     <style id="boolean" _name="Boolean Value" map-to="def:boolean"/>
     <style id="decimal" _name="Decimal number" map-to="def:decimal"/>
     <style id="hexadecimal" _name="Hexadecimal number" map-to="def:base-n-integer"/>
   </styles>
 
-  <default-regex-options case-sensitive="false"/>
+  <default-regex-options case-sensitive="true"/>
 
   <definitions>
 
@@ -54,10 +54,26 @@
       <end>'</end>
     </context>
 
+    
+    <context id="multi-line-string" style-ref="string">
+      <start>"\[</start>
+      <end>\]"</end>
+      
+    </context>
+    
     <context id="double-quoted-string" style-ref="string">
       <start>"</start>
       <end>"</end>
+       <include>
+         <context id="escaped-character" style-ref="escaped-character">
+           <match extended="true">
+           (\%\"|\%N|\%\%)
+           </match>
+         </context>
+       </include>
     </context>
+    
+    
 
     <context id="line-comment" style-ref="comment" end-at-line-end="true">
       <start>--</start>
@@ -67,13 +83,13 @@
     </context>
 
     <context id="debug" style-ref="debug">
-      <start>debug</start>
-      <end>end</end>
+      <start>(^|\s)debug(\s|$)</start>
+      <end>(^|\s)end(\s|$)</end>
     </context>
 
     <context id="assertion" style-ref="assertion">
-      <start>check</start>
-      <end>end</end>
+      <start>(^|\s)check(\s|$)</start>
+      <end>(^|\s)end(\s|$)</end>
     </context>
 
     <context id="keywords" style-ref="keyword">
@@ -85,6 +101,7 @@
       <keyword>class</keyword>
       <keyword>obsolete</keyword>
       <keyword>inherit</keyword>
+      <keyword>insert</keyword>
 
       <!-- parent list -->
       <keyword>rename</keyword>
@@ -106,7 +123,7 @@
 
       <!-- routine -->
       <keyword>obsolete</keyword>
-      <keyword>require+(\s+else)</keyword>
+      <keyword>require\s*(else)?</keyword>
       <keyword>local</keyword>
 
       <!-- routine body -->
@@ -115,7 +132,7 @@
       <keyword>once</keyword>
       <keyword>external</keyword>
       <keyword>alias</keyword>
-      <keyword>ensure+(\s+then)</keyword>
+      <keyword>ensure\s*(then)?</keyword>
       <keyword>rescue</keyword>
       <keyword>end</keyword>
       <keyword>unique</keyword>
@@ -123,8 +140,8 @@
       <keyword>end</keyword>
 
       <!-- binary -->
-      <keyword>and+(\s+then)</keyword>
-      <keyword>or+(\s+else)</keyword>
+      <keyword>and\s*(then)?</keyword>
+      <keyword>or\s*(else)?</keyword>
       <keyword>xor</keyword>
       <keyword>implies</keyword>
 
@@ -140,7 +157,6 @@
       <keyword>end</keyword>
       <keyword>inspect</keyword>
       <keyword>when</keyword>
-      <keyword>then</keyword>
       <keyword>end</keyword>
 
       <!-- loop -->
@@ -168,67 +184,7 @@
       <keyword>Result</keyword>
     </context>
 
-    <context id="builtin-types" style-ref="type">
-      <keyword>CHARACTER</keyword>
-      <keyword>STRING</keyword>
-      <keyword>BIT</keyword>
-      <keyword>BOOLEAN</keyword>
-      <keyword>INTEGER</keyword>
-      <keyword>REAL</keyword>
-      <keyword>NONE</keyword>
-      <keyword>ANY</keyword>
-    </context>
-
-    <context id="lib-eiffel-base" style-ref="type">
-      <keyword>ACTIVE</keyword>
-      <keyword>ARRAYED_LIST_CURSOR</keyword>
-      <keyword>ARRAYED_LIST</keyword>
-      <keyword>ARRAYED_STACK</keyword>
-      <keyword>BILINEAR</keyword>
-      <keyword>BI_LINKABLE</keyword>
-      <keyword>CELL</keyword>
-      <keyword>CONTAINER</keyword>
-      <keyword>COUNTABLE</keyword>
-      <keyword>CURSOR</keyword>
-      <keyword>DYNAMIC_LIST</keyword>
-      <keyword>HASH_TABLE_CURSOR</keyword>
-      <keyword>HASH_TABLE</keyword>
-      <keyword>INDEXABLE</keyword>
-      <keyword>LINEAR</keyword>
-      <keyword>LINKABLE</keyword>
-      <keyword>LINKED_LIST_CURSOR</keyword>
-      <keyword>LINKED_LIST</keyword>
-      <keyword>LINKED_QUEUE</keyword>
-      <keyword>LINKED_STACK</keyword>
-      <keyword>LIST</keyword>
-      <keyword>QUEUE</keyword>
-      <keyword>RESIZABLE</keyword>
-      <keyword>SEQUENCE</keyword>
-      <keyword>SET</keyword>
-      <keyword>STACK</keyword>
-      <keyword>TWO_WAY_LIST_CURSOR</keyword>
-      <keyword>TWO_WAY_LIST</keyword>
-      <keyword>UNBOUNDED</keyword>
-    </context>
-
-    <context id="lib-eiffel-time" style-ref="type">
-      <keyword>ABSOLUTE</keyword>
-      <keyword>DATE_CONSTANTS</keyword>
-      <keyword>DATE_DURATION</keyword>
-      <keyword>DATE</keyword>
-      <keyword>DATE_TIME_CONSTANTS</keyword>
-      <keyword>DATE_TIME_DURATION</keyword>
-      <keyword>DATE_TIME</keyword>
-      <keyword>DATE_TIME_VALUE</keyword>
-      <keyword>DATE_VALUE</keyword>
-      <keyword>DURATION</keyword>
-      <keyword>TIME_CONSTANTS</keyword>
-      <keyword>TIME_DURATION</keyword>
-      <keyword>TIME</keyword>
-      <keyword>TIME_VALUE</keyword>
-    </context>
-
-    <context id="void-value" style-ref="void-value">
+    <context id="void-value" style-ref="void">
       <keyword>Void</keyword>
     </context>
 
@@ -237,6 +193,13 @@
       <keyword>True</keyword>
     </context>
 
+    <context id="class-types" style-ref="type">
+      <match extended="true">
+      [A-Z_][A-Z0-9_]+
+      </match>
+    </context>
+
+
     <context id="number" style-ref="decimal">
       <match extended="true">
       (?&lt;![\w\.])
@@ -256,15 +219,14 @@
     <context id="eiffel">
       <include>
         <context ref="single-quoted-string"/>
+        <context ref="multi-line-string"/>
         <context ref="double-quoted-string"/>
         <context ref="line-comment"/>
         <context ref="debug"/>
         <context ref="assertion"/>
         <context ref="keywords"/>
         <context ref="predefined-variables"/>
-        <context ref="builtin-types"/>
-        <context ref="lib-eiffel-base"/>
-        <context ref="lib-eiffel-time"/>
+        <context ref="class-types"/>
         <context ref="void-value"/>
         <context ref="boolean"/>
         <context ref="number"/>

moo/mooedit/langs/haskell.lang

@@ -190,6 +190,7 @@
       <keyword>qualified</keyword>
       <keyword>then</keyword>
       <keyword>where</keyword>
+      <keyword>type</keyword>
     </context>
 
     <context id="body">

moo/mooedit/langs/oblivion.xml

@@ -61,6 +61,7 @@
   <style name="cursor"                      foreground="aluminium2"/>
   <style name="current-line"                background="aluminium5"/>
   <style name="line-numbers"                foreground="aluminium5" background="#black"/>
+  <style name="draw-spaces"                 foreground="aluminium4"/>
 
   <!-- Bracket Matching -->
   <style name="bracket-match"               foreground="aluminium1" background="aluminium3" bold="true"/>

moo/mooedit/langs/octave.lang

@@ -157,7 +157,7 @@
       <keyword>atan2</keyword>
       <keyword>atan</keyword>
       <keyword>ceil</keyword>
-      <keyword>colums</keyword>
+      <keyword>columns</keyword>
       <keyword>conv</keyword>
       <keyword>cosh</keyword>
       <keyword>cos</keyword>

moo/mooedit/langs/prolog.lang

@@ -20,7 +20,7 @@
  Boston, MA 02111-1307, USA.
 
 -->
-<language id="prolog" name="Prolog" version="2.0" _section="Sources">
+<language id="prolog" _name="Prolog" version="2.0" _section="Sources">
   <metadata>
     <property name="mimetypes">text/x-prolog</property>
     <property name="globs">*.prolog</property>
@@ -134,6 +134,7 @@
       <keyword>current_prolog_flag</keyword>
       <keyword>put_char</keyword>
       <keyword>asserta</keyword>
+      <keyword>assert</keyword>
       <keyword>fail</keyword>
       <keyword>put_code</keyword>
       <keyword>assertz</keyword>

moo/mooedit/langs/rpmspec.lang

@@ -111,6 +111,7 @@
     <context id="spec-macro" style-ref="spec-macro">
       <prefix>%</prefix>
       <keyword>defattr</keyword>
+      <keyword>docdir</keyword>
       <keyword>doc</keyword>
       <keyword>setup</keyword>
       <keyword>config</keyword>

moo/mooedit/langs/sh.lang

@@ -214,13 +214,12 @@
     </context>
 
     <context id="built-in-command-2" style-ref="keyword">
-      <prefix>(?&lt;![^\s;\(\)])</prefix>
-      <suffix>(?![^\s;\(\)])</suffix>
+      <prefix>(?&lt;![^\s;\(\)\`])</prefix>
+      <suffix>(?![^\s;\(\)\`])</suffix>
       <keyword>do</keyword>
       <keyword>done</keyword>
       <keyword>elif</keyword>
       <keyword>else</keyword>
-      <keyword>else</keyword>
       <keyword>fi</keyword>
       <keyword>for</keyword>
       <keyword>function</keyword>
@@ -230,7 +229,6 @@
       <keyword>then</keyword>
       <keyword>until</keyword>
       <keyword>while</keyword>
-      <keyword>bash</keyword>
       <keyword>alias</keyword>
       <keyword>bg</keyword>
       <keyword>bind</keyword>
@@ -257,14 +255,12 @@
       <keyword>help</keyword>
       <keyword>history</keyword>
       <keyword>jobs</keyword>
-      <keyword>kill</keyword>
       <keyword>let</keyword>
       <keyword>local</keyword>
       <keyword>logout</keyword>
       <keyword>popd</keyword>
       <keyword>printf</keyword>
       <keyword>pushd</keyword>
-      <keyword>pwd</keyword>
       <keyword>read</keyword>
       <keyword>readonly</keyword>
       <keyword>return</keyword>
@@ -296,83 +292,170 @@
     <context id="common-command" style-ref="common-command">
       <prefix>(?&lt;![\w\-\.])</prefix>
       <suffix>(?![\w\-\.])</suffix>
+      <keyword>ar</keyword>
       <keyword>awk</keyword>
+      <keyword>basename</keyword>
+      <keyword>bash</keyword>
       <keyword>beep</keyword>
       <keyword>bunzip2</keyword>
+      <keyword>bzcat</keyword>
+      <keyword>bzcmp</keyword>
+      <keyword>bzdiff</keyword>
+      <keyword>bzegrep</keyword>
+      <keyword>bzfgrep</keyword>
+      <keyword>bzgrep</keyword>
+      <keyword>bzip2recover</keyword>
       <keyword>bzip2</keyword>
+      <keyword>bzless</keyword>
+      <keyword>bzmore</keyword>
+      <keyword>cc</keyword>
       <keyword>cat</keyword>
+      <keyword>chattr</keyword>
+      <keyword>chgrp</keyword>
       <keyword>chmod</keyword>
       <keyword>chown</keyword>
+      <keyword>chroot</keyword>
       <keyword>clear</keyword>
+      <keyword>cmp</keyword>
+      <keyword>cpp</keyword>
       <keyword>cp</keyword>
+      <keyword>cut</keyword>
       <keyword>date</keyword>
       <keyword>dd</keyword>
       <keyword>df</keyword>
       <keyword>dialog</keyword>
+      <keyword>diff3</keyword>
       <keyword>diff</keyword>
+      <keyword>dirname</keyword>
       <keyword>dir</keyword>
       <keyword>du</keyword>
+      <keyword>egrep</keyword>
       <keyword>eject</keyword>
+      <keyword>env</keyword>
       <keyword>expr</keyword>
+      <keyword>false</keyword>
+      <keyword>fgrep</keyword>
       <keyword>file</keyword>
       <keyword>find</keyword>
+      <keyword>fmt</keyword>
+      <keyword>free</keyword>
+      <keyword>ftp</keyword>
+      <keyword>funzip</keyword>
+      <keyword>fuser</keyword>
+      <keyword>gawk</keyword>
       <keyword>gcc</keyword>
+      <keyword>getent</keyword>
+      <keyword>getopt</keyword>
       <keyword>grep</keyword>
+      <keyword>groups</keyword>
       <keyword>gunzip</keyword>
       <keyword>gzip</keyword>
       <keyword>head</keyword>
+      <keyword>hostname</keyword>
       <keyword>id</keyword>
       <keyword>ifconfig</keyword>
       <keyword>info</keyword>
       <keyword>insmod</keyword>
+      <keyword>install</keyword>
+      <keyword>join</keyword>
       <keyword>killall</keyword>
+      <keyword>kill</keyword>
+      <keyword>lastb</keyword>
+      <keyword>last</keyword>
       <keyword>ld</keyword>
       <keyword>less</keyword>
       <keyword>ln</keyword>
       <keyword>locate</keyword>
+      <keyword>lockfile</keyword>
+      <keyword>login</keyword>
+      <keyword>logname</keyword>
+      <keyword>lp</keyword>
+      <keyword>lpr</keyword>
+      <keyword>lsattr</keyword>
       <keyword>ls</keyword>
       <keyword>lsmod</keyword>
       <keyword>make</keyword>
       <keyword>man</keyword>
       <keyword>mkdir</keyword>
+      <keyword>mkfifo</keyword>
+      <keyword>mknod</keyword>
+      <keyword>mktemp</keyword>
       <keyword>modprobe</keyword>
       <keyword>more</keyword>
       <keyword>mount</keyword>
       <keyword>mv</keyword>
+      <keyword>namei</keyword>
+      <keyword>nawk</keyword>
       <keyword>nice</keyword>
+      <keyword>nl</keyword>
       <keyword>passwd</keyword>
       <keyword>patch</keyword>
+      <keyword>perl</keyword>
+      <keyword>pgawk</keyword>
       <keyword>pidof</keyword>
       <keyword>ping</keyword>
       <keyword>pkg-config</keyword>
+      <keyword>pr</keyword>
       <keyword>ps</keyword>
+      <keyword>pwd</keyword>
+      <keyword>readlink</keyword>
       <keyword>renice</keyword>
       <keyword>rmdir</keyword>
       <keyword>rm</keyword>
+      <keyword>scp</keyword>
       <keyword>sed</keyword>
+      <keyword>seq</keyword>
       <keyword>sh</keyword>
       <keyword>sleep</keyword>
       <keyword>sort</keyword>
+      <keyword>split</keyword>
+      <keyword>ssh-add</keyword>
+      <keyword>ssh-agent</keyword>
+      <keyword>ssh-keygen</keyword>
+      <keyword>ssh-keyscan</keyword>
+      <keyword>ssh</keyword>
+      <keyword>stat</keyword>
       <keyword>sudo</keyword>
+      <keyword>sum</keyword>
       <keyword>su</keyword>
+      <keyword>sync</keyword>
+      <keyword>tac</keyword>
       <keyword>tail</keyword>
       <keyword>tar</keyword>
+      <keyword>tee</keyword>
       <keyword>tempfile</keyword>
       <keyword>touch</keyword>
+      <keyword>true</keyword>
       <keyword>tr</keyword>
       <keyword>umount</keyword>
       <keyword>uname</keyword>
       <keyword>uniq</keyword>
+      <keyword>unlink</keyword>
       <keyword>unzip</keyword>
       <keyword>uptime</keyword>
+      <keyword>wall</keyword>
+      <keyword>wc</keyword>
       <keyword>wget</keyword>
       <keyword>whereis</keyword>
       <keyword>which</keyword>
       <keyword>whoami</keyword>
       <keyword>who</keyword>
+      <keyword>write</keyword>
+      <keyword>w</keyword>
+      <keyword>xargs</keyword>
       <keyword>xdialog</keyword>
+      <keyword>zcat</keyword>
+      <keyword>zcmp</keyword>
+      <keyword>zdiff</keyword>
+      <keyword>zegrep</keyword>
       <keyword>zenity</keyword>
+      <keyword>zfgrep</keyword>
+      <keyword>zforce</keyword>
+      <keyword>zgrep</keyword>
       <keyword>zip</keyword>
+      <keyword>zless</keyword>
+      <keyword>zmore</keyword>
+      <keyword>znew</keyword>
     </context>
 
     <context id="case">