allow symbolic names (symbols) being specified for the scintilla (ES) command

 * new syntax is <[lParam,[wParam,[msg]]]>ES[msg[,wParam[,lParam]]]$[lParam string]$
 * symbols are matched case-insensitive, the leading SCI_ for message symbols may be omitted
 * added support for more multiple string arguments (for commands in general)
 * fixed "C conditional: succeeds for every alpanumeric character, dot, dollar or underscore
 * added SCLEX_ and SCE_ constants as symbols
 * updated teco.ini: using symbolic names is preferred since that way code does not depend on the current Scintilla version

1 files changed, 29 insertions, 27 deletions

diff --git a/teco.ini b/teco.ini
index 2925b53..01de669 100644
--- a/teco.ini
+++ b/teco.ini
@@ -13,32 +13,34 @@
   ! <bold,bg,fg,style>M.r !
   @.r{
     U.sU.vU.bU.h
-    Q.v:M.c,Q.s,2051ES
-    Q.b:M.c,Q.s,2052ES
-    Q.h,Q.s,2053ES
+    Q.v:M.c,Q.sESSTYLESETFORE
+    Q.b:M.c,Q.sESSTYLESETBACK
+    Q.h,Q.sESSTYLESETBOLD
   }
 
   ZJ -:S.[cpp,c,h]"S Z-."=
     EBQ.f
-    3,4001ES
-    0,4005ESand and_eq asm auto bitand bitor bool break
-            case catch char class compl const const_cast continue
-            default delete do double dynamic_cast else enum explicit export extern false float for
-            friend goto if inline int long mutable namespace new not not_eq
-            operator or or_eq private protected public
-            register reinterpret_cast return short signed sizeof static static_cast struct switch
-            template this throw true try typedef typeid typename union unsigned using
-            virtual void volatile wchar_t while xor xor_eq
-    2,4005ESa addindex addtogroup anchor arg attention
-            author b brief bug c class code date def defgroup deprecated dontinclude
-            e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception
-            f$ f[ f] file fn hideinitializer htmlinclude htmlonly
-            if image include ingroup internal invariant interface latexonly li line link
-            mainpage name namespace nosubgrouping note overload
-            p page par param post pre ref relates remarks return retval
-            sa section see showinitializer since skip skipline struct subsection
-            test throw todo typedef union until
-            var verbatim verbinclude version warning weakgroup $ @ \ & < > # { }
+    ESSETLEXER,SCLEX_CPP
+    0ESSETKEYWORDS
+      and and_eq asm auto bitand bitor bool break
+      case catch char class compl const const_cast continue
+      default delete do double dynamic_cast else enum explicit export extern false float for
+      friend goto if inline int long mutable namespace new not not_eq
+      operator or or_eq private protected public
+      register reinterpret_cast return short signed sizeof static static_cast struct switch
+      template this throw true try typedef typeid typename union unsigned using
+      virtual void volatile wchar_t while xor xor_eq
+    2ESSETKEYWORDS
+      a addindex addtogroup anchor arg attention
+      author b brief bug c class code date def defgroup deprecated dontinclude
+      e em endcode endhtmlonly endif endlatexonly endlink endverbatim enum example exception
+      f$ f[ f] file fn hideinitializer htmlinclude htmlonly
+      if image include ingroup internal invariant interface latexonly li line link
+      mainpage name namespace nosubgrouping note overload
+      p page par param post pre ref relates remarks return retval
+      sa section see showinitializer since skip skipline struct subsection
+      test throw todo typedef union until
+      var verbatim verbinclude version warning weakgroup $ @ \ & < > # { }
     ! Whitespace   ! 0,0,2,0:M.r
     ! Comments     ! 0,0,2,1:M.r 0,0,2,2:M.r 1,0,2,3:M.r
     ! Number       ! 0,0,1,4:M.r
@@ -52,8 +54,8 @@
 
   ZJ -:Smakefile"S Z-."=
     EBQ.f
-    11,4001ES
-    0,4005ESifeq else endif
+    ESSETLEXER,SCLEX_MAKEFILE
+    0ESSETKEYWORDSifeq else endif
     ! Default      ! 0,0,7,0:M.r
     ! Comments     ! 0,0,2,1:M.r
     ! Preprocessor ! 0,0,4,2:M.r
@@ -79,9 +81,9 @@
 ED#32ED
 
 ! margins !
-5,0,2242ES
-0,1,2242ES
-1,2,2242ES
+5,0ESSETMARGINWIDTHN
+0,1ESSETMARGINWIDTHN
+1,2ESSETMARGINWIDTHN
 
 ! open all files specified on the commandline !
 [.f