Syntax fixes (eiffel, perl, php, syntax).

2005-04-16 23:53:28 +00:00 · 2005-04-16 23:53:28 +00:00 · c774c5b4a7
--- a/7
+++ b/7
@ -1,3 +1,10 @@
+2005-04-17  Leonard den Ottolander <leonard * den ottolander nl>
+	* syntax/eiffel.syntax: dos2unix; removed redundant cooledit
+	colour definitions.
+	* syntax/perl.syntax: Removed redundant cooledit definitions.
+	* syntax/php.syntax: ' ' and " " context fixes.
+	* syntax/syntax.syntax: Removed 2 duplicate lines.
+
 2005-04-16  Roland Illig  <roland.illig@gmx.de>

 	* lib/mc.ext.in: Recognize either *.udeb or *.deb as Debian
--- a/syntax/eiffel.syntax
+++ b/syntax/eiffel.syntax
@ -2,114 +2,113 @@
 # Daniel F Moisset - dmoisset@grulic.org.ar
 # Based on mc's pascal.syntax

-context default yellow/24
+context default yellow

-	keyword whole agent	white/24
-	keyword whole alias	white/24
-	keyword whole as	white/24
-	keyword whole check	white/24
-	keyword whole class	white/24
-	keyword whole create	white/24
-	keyword whole creation	white/24
-	keyword whole debug	white/24
-	keyword whole deferred	white/24
-	keyword whole do	white/24
-	keyword whole else	white/24
-	keyword whole elseif	white/24
-	keyword whole end	white/24
-	keyword whole ensure	white/24
-	keyword whole expanded	white/24
-	keyword whole export	white/24
-	keyword whole external	white/24
-	keyword whole feature	white/24
-	keyword whole from	white/24
-	keyword whole if	white/24
-	keyword whole is	white/24
-	keyword whole indexing	white/24
-	keyword whole inherit	white/24
-	keyword whole inspect	white/24
-	keyword whole invariant	white/24
-	keyword whole like	white/24
-	keyword whole local	white/24
-	keyword whole loop	white/24
-	keyword whole obsolete	white/24
-	keyword whole old	white/24
-	keyword whole once	white/24
-	keyword whole redefine	white/24
-	keyword whole reference	white/24
-	keyword whole rename	white/24
-	keyword whole require	white/24
-	keyword whole rescue	white/24
-	keyword whole retry	white/24
-	keyword whole select	white/24
-	keyword whole then	white/24
-	keyword whole undefine	white/24
-	keyword whole unique	white/24
-	keyword whole until	white/24
-	keyword whole variant	white/24
-	keyword whole when	white/24
+	keyword whole agent	white
+	keyword whole alias	white
+	keyword whole as	white
+	keyword whole check	white
+	keyword whole class	white
+	keyword whole create	white
+	keyword whole creation	white
+	keyword whole debug	white
+	keyword whole deferred	white
+	keyword whole do	white
+	keyword whole else	white
+	keyword whole elseif	white
+	keyword whole end	white
+	keyword whole ensure	white
+	keyword whole expanded	white
+	keyword whole export	white
+	keyword whole external	white
+	keyword whole feature	white
+	keyword whole from	white
+	keyword whole if	white
+	keyword whole is	white
+	keyword whole indexing	white
+	keyword whole inherit	white
+	keyword whole inspect	white
+	keyword whole invariant	white
+	keyword whole like	white
+	keyword whole local	white
+	keyword whole loop	white
+	keyword whole obsolete	white
+	keyword whole old	white
+	keyword whole once	white
+	keyword whole redefine	white
+	keyword whole reference	white
+	keyword whole rename	white
+	keyword whole require	white
+	keyword whole rescue	white
+	keyword whole retry	white
+	keyword whole select	white
+	keyword whole then	white
+	keyword whole undefine	white
+	keyword whole unique	white
+	keyword whole until	white
+	keyword whole variant	white
+	keyword whole when	white

-	keyword whole Current	brightmagenta/23
-	keyword whole Precursor	brightmagenta/23
-	keyword whole Result	brightmagenta/23
-	keyword whole Void	brightmagenta/23
+	keyword whole Current	brightmagenta
+	keyword whole Precursor	brightmagenta
+	keyword whole Result	brightmagenta
+	keyword whole Void	brightmagenta

 # prevents - keyword from interfering with comment
-	keyword --	lightgray/22
+	keyword --	lightgray

-	keyword :=	brightcyan/6
-	keyword ?=	brightcyan/6
-	keyword !	brightcyan/6
-	keyword :	brightcyan/6
-	keyword ;	brightcyan/6
-	keyword (	brightcyan/6
-	keyword )	brightcyan/6
-	keyword [	brightcyan/6
-	keyword ]	brightcyan/6
+	keyword :=	brightcyan
+	keyword ?=	brightcyan
+	keyword !	brightcyan
+	keyword :	brightcyan
+	keyword ;	brightcyan
+	keyword (	brightcyan
+	keyword )	brightcyan
+	keyword [	brightcyan
+	keyword ]	brightcyan

-	keyword {*}	brightred/6
+	keyword {*}	brightred

-	keyword \+	cyan/14
-	keyword -	cyan/14
-	keyword \*	cyan/14
-	keyword /	cyan/14
-	keyword >	cyan/14
-	keyword <	cyan/14
-	keyword =	cyan/14
-	keyword ^	cyan/14
-	keyword \\	cyan/14
-	keyword @	cyan/14
-	keyword |	cyan/14
-	keyword whole and	cyan/14
-	keyword whole implies	cyan/14
-	keyword whole not	cyan/14
-	keyword whole xor	cyan/14
-	keyword whole or	cyan/14
+	keyword \+	cyan
+	keyword -	cyan
+	keyword \*	cyan
+	keyword /	cyan
+	keyword >	cyan
+	keyword <	cyan
+	keyword =	cyan
+	keyword ^	cyan
+	keyword \\	cyan
+	keyword @	cyan
+	keyword |	cyan
+	keyword whole and	cyan
+	keyword whole implies	cyan
+	keyword whole not	cyan
+	keyword whole xor	cyan
+	keyword whole or	cyan

 # Uncomment this to highlight tabs and trailing spaces
-#	keyword \t yellow/24 red/6
-#	keyword \s\[\s\]\n yellow/24 red/6
+#	keyword \t yellow red
+#	keyword \s\[\s\]\n yellow red

 # Comments
-context exclusive -- \n	lightgray/22
-        keyword `*' brown/22
+context exclusive -- \n	lightgray
+        keyword `*' brown

 # Strings and characters
-context " "	green/green
-	keyword %N	brightgreen/6
-	keyword %R	brightgreen/6
-	keyword %U	brightgreen/6
-	keyword %"	brightgreen/6
-	keyword %'	brightgreen/6
-	keyword %%	brightgreen/6
-	keyword %/\[0123456789\]/	brightgreen/6
-
-context ' '	green/green
-	keyword %N	brightgreen/6
-	keyword %R	brightgreen/6
-	keyword %U	brightgreen/6
-	keyword %"	brightgreen/6
-	keyword %'	brightgreen/6
-	keyword %%	brightgreen/6
-	keyword %/\[0123456789\]/	brightgreen/6
+context " "	green
+	keyword %N	brightgreen
+	keyword %R	brightgreen
+	keyword %U	brightgreen
+	keyword %"	brightgreen
+	keyword %'	brightgreen
+	keyword %%	brightgreen
+	keyword %/\[0123456789\]/	brightgreen

+context ' '	green
+	keyword %N	brightgreen
+	keyword %R	brightgreen
+	keyword %U	brightgreen
+	keyword %"	brightgreen
+	keyword %'	brightgreen
+	keyword %%	brightgreen
+	keyword %/\[0123456789\]/	brightgreen
--- a/syntax/perl.syntax
+++ b/syntax/perl.syntax
@ -5,59 +5,59 @@ context default
    keyword whole linestart #!\[\s\]/\[abcdefghijklmnopqrstuvwxyz\]/bin/perl brightcyan black
    keyword whole linestart #!\[\s\]/bin/perl brightcyan black

-    keyword $_ red/orange
-    keyword $. red/orange
-    keyword $/ red/orange
-    keyword $, red/orange
-    keyword $" red/orange
-    keyword $\\ red/orange
-    keyword $# red/orange
-    keyword $\* red/orange
-    keyword $? red/orange
-    keyword $] red/orange
-    keyword $[ red/orange
-    keyword $; red/orange
-    keyword $! red/orange
-    keyword $@ red/orange
-    keyword $: red/orange
-    keyword $0 red/orange
-    keyword $$ red/orange
-    keyword $< red/orange
-    keyword $> red/orange
-    keyword $( red/orange
-    keyword $) red/orange
+    keyword $_ red
+    keyword $. red
+    keyword $/ red
+    keyword $, red
+    keyword $" red
+    keyword $\\ red
+    keyword $# red
+    keyword $\* red
+    keyword $? red
+    keyword $] red
+    keyword $[ red
+    keyword $; red
+    keyword $! red
+    keyword $@ red
+    keyword $: red
+    keyword $0 red
+    keyword $$ red
+    keyword $< red
+    keyword $> red
+    keyword $( red
+    keyword $) red

-    keyword $% red/orange
-    keyword $= red/orange
-    keyword $- red/orange
-    keyword $~ red/orange
-    keyword $| red/orange
-    keyword $& red/orange
-    keyword $` red/orange
-    keyword $' red/orange
-    keyword $\+ red/orange
-    keyword $\{0123456789\}\{0123456789\} red/orange
-    keyword $\{0123456789\} red/orange
+    keyword $% red
+    keyword $= red
+    keyword $- red
+    keyword $~ red
+    keyword $| red
+    keyword $& red
+    keyword $` red
+    keyword $' red
+    keyword $\+ red
+    keyword $\{0123456789\}\{0123456789\} red
+    keyword $\{0123456789\} red

-    keyword $^A red/orange
-    keyword $^D red/orange
-    keyword $^E red/orange
-    keyword $^I red/orange
-    keyword $^L red/orange
-    keyword $^P red/orange
-    keyword $^T red/orange
-    keyword $^W red/orange
-    keyword $^X red/orange
-    keyword $^A red/orange
+    keyword $^A red
+    keyword $^D red
+    keyword $^E red
+    keyword $^I red
+    keyword $^L red
+    keyword $^P red
+    keyword $^T red
+    keyword $^W red
+    keyword $^X red
+    keyword $^A red

-    keyword @EXPORT red/orange
-    keyword @EXPORT_OK red/orange
-    keyword @INC red/orange
-    keyword @ISA red/orange
-    keyword @_ red/orange
-    keyword @ENV red/orange
-    keyword @OVERLOAD red/orange
-    keyword @SIG red/orange
+    keyword @EXPORT red
+    keyword @EXPORT_OK red
+    keyword @INC red
+    keyword @ISA red
+    keyword @_ red
+    keyword @ENV red
+    keyword @OVERLOAD red
+    keyword @SIG red


    keyword <+> brightred
@ -101,7 +101,7 @@ context default
    keyword whole STDARGV brightred
    keyword whole DATA brightred

-    keyword wholeright $+ brightgreen/PaleGreen
+    keyword wholeright $+ brightgreen
    keyword wholeright %+ brightcyan
    keyword wholeright @+ white
    keyword \\" brightred
@ -166,19 +166,19 @@ context default
    keyword whole pack yellow
    keyword whole unpack yellow

-    keyword whole chomp yellow/YellowGreen
-    keyword whole chop yellow/YellowGreen
-    keyword whole crypt yellow/YellowGreen
-    keyword whole eval yellow/YellowGreen
-    keyword whole index yellow/YellowGreen
-    keyword whole length yellow/YellowGreen
-    keyword whole lc yellow/YellowGreen
-    keyword whole lcfirst yellow/YellowGreen
-    keyword whole quotemeta yellow/YellowGreen
-    keyword whole rindex yellow/YellowGreen
-    keyword whole substr yellow/YellowGreen
-    keyword whole uc yellow/YellowGreen
-    keyword whole ucfirst yellow/YellowGreen
+    keyword whole chomp yellow
+    keyword whole chop yellow
+    keyword whole crypt yellow
+    keyword whole eval yellow
+    keyword whole index yellow
+    keyword whole length yellow
+    keyword whole lc yellow
+    keyword whole lcfirst yellow
+    keyword whole quotemeta yellow
+    keyword whole rindex yellow
+    keyword whole substr yellow
+    keyword whole uc yellow
+    keyword whole ucfirst yellow

    keyword whole delete yellow
    keyword whole each yellow
--- a/syntax/php.syntax
+++ b/syntax/php.syntax
@ -1,5 +1,8 @@
 # PHP syntax file

+# 2005-04-16  Leonard den Ottolander <leonard den ottolander nl>
+#	* ' ' and " " context fixes
+
 # 2004-09-04  Leonard den Ottolander <leonard * den ottolander nl>
 #	* function keywords regenerated from the docs at http://www.php.net
 #	* separated classes and methods
@ -22,7 +25,7 @@
 context default

 ######################
-# Control srtuctures
+# Control structures

    keyword whole break brightmagenta
    keyword whole case brightmagenta
@ -3651,10 +3654,6 @@ context default

    keyword wholeright $+ brightgreen

-    keyword " green
-
-    keyword '*' brightgreen
-
    keyword /\* brown
    keyword \*/ brown
    keyword // brown
@ -3710,7 +3709,7 @@ context exclusive // \n brown
 context linestart # \n brown
    spellcheck

-context exclusive " " green
+context " " green
    spellcheck
    keyword \\" brightgreen
    keyword \\\n brightgreen
@ -3725,3 +3724,7 @@ context exclusive " " green
    keyword \\\\ brightgreen
    keyword \\' brightgreen
    keyword \\\{abtnvfr\} brightgreen
+
+context ' ' brightgreen
+    spellcheck
+    keyword \\' brightcyan
--- a/syntax/syntax.syntax
+++ b/syntax/syntax.syntax
@ -6,13 +6,11 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.\\[]{

 context default
 # Invalid combinations, not highlighted
-    keyword whole linestart\[\t\s\]whole
    keyword whole linestart\[\t\s\]whole
    keyword whole linestart\[\t\s\]wholeleft
    keyword whole linestart\[\t\s\]wholeright

 # Combinations below are valid
-    keyword whole whole\[\t\s\]linestart brightcyan
    keyword whole whole\[\t\s\]linestart brightcyan
    keyword whole wholeleft\[\t\s\]linestart brightcyan
    keyword whole wholeright\[\t\s\]linestart brightcyan
@ -53,4 +51,3 @@ context default
    keyword whole white white

 context linestart # \n brown
-