+ set: EDITLEXER sentinel

2026-06-14 21:09:05 +08:00 · 2018-09-22 13:07:22 +02:00 · 2018-09-22 13:07:22 +02:00 · ca5fe236d5
commit ca5fe236d5
parent d0a9e1d705
48 changed files with 86 additions and 50 deletions
--- a/src/StyleLexers/EditLexer.h
+++ b/src/StyleLexers/EditLexer.h
@ -6,6 +6,7 @@
 #define WIN32_LEAN_AND_MEAN 1
 #define NOMINMAX 1
 #include <windows.h>
+#include "Scintilla.h"

 // -----------------------------------------------------------------------------

@ -52,6 +53,39 @@ typedef struct _editlexer

 } EDITLEXER, *PEDITLEXER;

+// -----------------------------------------------------------------------------
+
+// Default Style (styleLexStandard.c) Indices
+typedef enum {
+  STY_DEFAULT = 0,
+  STY_MARGIN = 1,
+  STY_BRACE_OK = 2,
+  STY_BRACE_BAD = 3,
+  STY_CTRL_CHR = 4,
+  STY_INDENT_GUIDE = 5,
+  STY_SEL_TXT = 6,
+  STY_WHITESPACE = 7,
+  STY_CUR_LN_BCK = 8,
+  STY_CARET = 9,
+  STY_LONG_LN_MRK = 10,
+  STY_X_LN_SPACE = 11,
+  STY_BOOK_MARK = 12,
+  STY_MARK_OCC = 13,
+  STY_URL_HOTSPOT = 14,
+  STY_IME_COLOR = 15,
+  STY_INVISIBLE = 16,
+  STY_READONLY = 17
+
+  // MAX = 127
+}
+LexDefaultStyles;
+
+#define _STYLE_GETSTYLEID(ID) ((int)(STYLE_MAX - ID))
+#define Style_GetHotspotStyleID()   _STYLE_GETSTYLEID(STY_URL_HOTSPOT)
+#define Style_GetInvisibleStyleID() _STYLE_GETSTYLEID(STY_INVISIBLE)
+#define Style_GetReadonlyStyleID()  _STYLE_GETSTYLEID(STY_READONLY)
+
+
 // -----------------------------------------------------------------------------

 extern EDITLEXER lexStandard;      // Default Text
--- a/src/StyleLexers/StyleLexers.h
+++ b/src/StyleLexers/StyleLexers.h
@ -15,7 +15,7 @@


 #define MULTI_STYLE(a,b,c,d) ((a)|(b<<8)|(c<<16)|(d<<24))
-
+#define EDITLEXER_SENTINEL { -1, 00000, L"", L"", L"" }

 // ----------------------------------------------------------------------------

--- a/src/StyleLexers/styleLexAHK.c
+++ b/src/StyleLexers/styleLexAHK.c
@ -131,4 +131,4 @@ SCLEX_AHK, IDS_LEX_AHK, L"AutoHotkey Script", L"", L"",
    //{ SCE_AHK_WORD_UD, IDS_LEX_STR_63106, L"User Defined", L"fore:#800020", L"" },
    { SCE_AHK_VARREFKW, IDS_LEX_STR_63313, L"Variable Keyword", L"fore:#CF00CF; italic; back:#F9F9FF", L"" },
    { SCE_AHK_ERROR, IDS_LEX_STR_63261, L"Error", L"back:#FFC0C0", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexAHKL.c
+++ b/src/StyleLexers/styleLexAHKL.c
@ -147,4 +147,4 @@ SCLEX_AHKL, IDS_LEX_AHKL, L"AutoHotkey_L Script", L"ahkl; ahk; ia; scriptlet", L
    //{ SCE_AHKL_USERDEFINED2, IDS_LEX_STR_63106, L"User Defined", L"fore:#800020", L"" },
    { SCE_AHKL_ESCAPESEQ, IDS_LEX_STR_63306, L"Escape", L"fore:#660000; italic", L"" },
    { SCE_AHKL_ERROR, IDS_LEX_STR_63261, L"Error", L"back:#FF0000", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexASM.c
+++ b/src/StyleLexers/styleLexASM.c
@ -106,5 +106,5 @@ SCLEX_ASM, IDS_LEX_ASM_SCR, L"Assembly Script", L"asm", L"",
    { SCE_ASM_DIRECTIVE, IDS_LEX_STR_63203, L"Directive", L"fore:#0A246A", L"" },
    { SCE_ASM_DIRECTIVEOPERAND, IDS_LEX_STR_63209, L"Directive Operand", L"fore:#0A246A", L"" },
    { SCE_ASM_REGISTER, IDS_LEX_STR_63208, L"Register", L"fore:#FF8000", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };

--- a/src/StyleLexers/styleLexAU3.c
+++ b/src/StyleLexers/styleLexAU3.c
@ -663,4 +663,4 @@ SCLEX_AU3, IDS_LEX_AUTOIT3, L"AutoIt3 Script", L"au3", L"",
    { SCE_AU3_SENT, IDS_LEX_STR_63279, L"Send Key", L"fore:#FF0000", L"" },
    { SCE_AU3_PREPROCESSOR, IDS_LEX_STR_63133, L"Preprocessor", L"fore:#FF8000", L"" },
    { SCE_AU3_SPECIAL, IDS_LEX_STR_63280, L"Special", L"fore:#FF8000", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexAVS.c
+++ b/src/StyleLexers/styleLexAVS.c
@ -90,4 +90,4 @@ SCLEX_AVS, IDS_LEX_AVI_SYNTH, L"AviSynth Script", L"avs; avsi", L"",
    { SCE_AVS_FUNCTION, IDS_LEX_STR_63277, L"Function", L"fore:#007F7F", L"" },
    { SCE_AVS_CLIPPROP, IDS_LEX_STR_63316, L"Clip Property", L"fore:#00007F", L"" },
    //{ SCE_AVS_USERDFN, IDS_LEX_STR_63106, L"User Defined", L"fore:#8000FF", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexAwk.c
+++ b/src/StyleLexers/styleLexAwk.c
@ -29,4 +29,4 @@ SCLEX_PYTHON,  IDS_LEX_AWK_SCR, L"Awk Script", L"awk", L"",
    { MULTI_STYLE(SCE_P_STRING,SCE_P_STRINGEOL,SCE_P_CHARACTER,0), IDS_LEX_STR_63131, L"String", L"fore:#008000", L"" },
    { SCE_P_NUMBER, IDS_LEX_STR_63130, L"Number", L"fore:#C04000", L"" },
    { SCE_P_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"fore:#B000B0", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexBASH.c
+++ b/src/StyleLexers/styleLexBASH.c
@ -35,4 +35,4 @@ SCLEX_BASH, IDS_LEX_SHELL_SCR, L"Shell Script", L"sh", L"",
    { SCE_SH_BACKTICKS, IDS_LEX_STR_63270, L"Back Ticks", L"fore:#FF0080", L"" },
    { SCE_SH_HERE_DELIM, IDS_LEX_STR_63271, L"Here-Doc (Delimiter)", L"", L"" },
    { SCE_SH_HERE_Q, IDS_LEX_STR_63272, L"Here-Doc (Single Quoted, q)", L"fore:#008080", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexBAT.c
+++ b/src/StyleLexers/styleLexBAT.c
@ -25,4 +25,4 @@ SCLEX_BATCH, IDS_LEX_BATCH, L"Batch Files", L"bat; cmd", L"",
    { SCE_BAT_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"fore:#B000B0", L"" },
    { MULTI_STYLE(SCE_BAT_COMMAND,SCE_BAT_HIDE,0,0), IDS_LEX_STR_63236, L"Command", L"bold", L"" },
    { SCE_BAT_LABEL, IDS_LEX_STR_63235, L"Label", L"fore:#C80000; back:#F4F4F4; eolfilled", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexCMAKE.c
+++ b/src/StyleLexers/styleLexCMAKE.c
@ -46,4 +46,4 @@ SCLEX_CMAKE, IDS_LEX_CMAKE, L"Cmake Script", L"cmake; ctest", L"",
    { SCE_CMAKE_STRINGVAR, IDS_LEX_STR_63267, L"Variable within String", L"back:#EEEEEE; fore:#CC3300", L"" },
    { SCE_CMAKE_NUMBER, IDS_LEX_STR_63130, L"Number", L"fore:#008080", L"" },
    //{ SCE_CMAKE_USERDEFINED, IDS_LEX_STR_63106, L"User Defined", L"fore:#800020", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexCOFFEESCRIPT.c
+++ b/src/StyleLexers/styleLexCOFFEESCRIPT.c
@ -19,4 +19,4 @@ EDITLEXER lexCOFFEESCRIPT = { SCLEX_COFFEESCRIPT, IDS_LEX_COFFEE_SCR, L"Coffeesc
                       //{ MULTI_STYLE(SCE_COFFEESCRIPT_COMMENTLINEDOC,SCE_COFFEESCRIPT_COMMENTDOCKEYWORD,SCE_COFFEESCRIPT_COMMENTDOCKEYWORDERROR,0), IDS_LEX_STR_63379, L"Comment line", L"fore:#646464", L"" },
                       { MULTI_STYLE(SCE_COFFEESCRIPT_WORD,SCE_COFFEESCRIPT_WORD2,0,0), IDS_LEX_STR_63341, L"Word", L"", L"" },
                       { MULTI_STYLE(SCE_COFFEESCRIPT_VERBATIM,SCE_COFFEESCRIPT_TRIPLEVERBATIM,0,0), IDS_LEX_STR_63342, L"Verbatim", L"", L"" },
-                       { -1, 00000, L"", L"", L"" } } };
+                       EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexCONF.c
+++ b/src/StyleLexers/styleLexCONF.c
@ -127,5 +127,5 @@ SCLEX_CONF, IDS_LEX_APC_CFG, L"Apache Config Files", L"conf; htaccess", L"",
 // Lexer is buggy     { SCE_CONF_OPERATOR, L"Operator", L"", L"" },
 // Lexer is buggy     { SCE_CONF_PARAMETER, L"Runtime Directive Parameter", L"", L"" },
 // Lexer is buggy     { SCE_CONF_EXTENSION, L"Extension", L"", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };

--- a/src/StyleLexers/styleLexCPP.c
+++ b/src/StyleLexers/styleLexCPP.c
@ -53,5 +53,5 @@ SCLEX_CPP, IDS_LEX_CPP_SRC, L"C/C++ Source Code", L"c; cpp; cxx; cc; h; hpp; hxx
    { MULTI_STYLE(SCE_C_PREPROCESSOR,SCE_C_PREPROCESSORCOMMENT,SCE_C_PREPROCESSORCOMMENTDOC,0), IDS_LEX_STR_63133, L"Preprocessor", L"fore:#FF8000", L"" },
    //{ SCE_C_UUID, L"UUID", L"", L"" },
    //{ SCE_C_REGEX, L"Regex", L"", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };

--- a/src/StyleLexers/styleLexCS.c
+++ b/src/StyleLexers/styleLexCS.c
@ -152,4 +152,4 @@ SCLEX_CPP, IDS_LEX_CSHARP_SRC, L"C# Source Code", L"cs", L"",
    //{ SCE_C_REGEX, L"Regex", L"", L"" },
    //{ SCE_C_WORD2, L"Word 2", L"", L"" },
    { SCE_C_GLOBALCLASS, IDS_LEX_STR_63304, L"Global Class", L"fore:#2B91AF", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexCSS.c
+++ b/src/StyleLexers/styleLexCSS.c
@ -84,6 +84,6 @@ SCLEX_CSS, IDS_LEX_CSS_STYLE, L"CSS Style Sheets", L"css; less; sass; scss", L""
    { SCE_CSS_VARIABLE, IDS_LEX_STR_63249, L"Variable", L"bold; fore:#FF4000", L"" },
    { SCE_CSS_UNKNOWN_PSEUDOCLASS, IDS_LEX_STR_63198, L"Unknown Pseudo-Class", L"fore:#C80000; back:#FFFF80", L"" },
    { SCE_CSS_UNKNOWN_IDENTIFIER, IDS_LEX_STR_63200, L"Unknown Property", L"fore:#C80000; back:#FFFF80", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };


--- a/src/StyleLexers/styleLexD.c
+++ b/src/StyleLexers/styleLexD.c
@ -50,4 +50,4 @@ SCLEX_D, IDS_LEX_D_SRC, L"D Source Code", L"d; dd; di", L"",
    //{ SCE_D_COMMENTDOCKEYWORD, L"Default", L"", L"" },
    //{ SCE_D_STRINGB, L"Default", L"", L"" },
    //{ SCE_D_STRINGR, L"Default", L"", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexDIFF.c
+++ b/src/StyleLexers/styleLexDIFF.c
@ -16,4 +16,4 @@ SCLEX_DIFF, IDS_LEX_DIFF, L"Diff Files", L"diff; patch", L"",
    { MULTI_STYLE(SCE_DIFF_ADDED, SCE_DIFF_PATCH_ADD, SCE_DIFF_REMOVED_PATCH_ADD, 0), IDS_LEX_STR_63240, L"Line Addition", L"fore:#002000; back:#80FF80; eolfilled", L"" },
    { MULTI_STYLE(SCE_DIFF_DELETED, SCE_DIFF_PATCH_DELETE, SCE_DIFF_REMOVED_PATCH_DELETE, 0), IDS_LEX_STR_63241, L"Line Removal", L"fore:#200000; back:#FF8080; eolfilled", L"" },
    { SCE_DIFF_CHANGED, IDS_LEX_STR_63242, L"Line Change", L"fore:#000020; back:#8080FF; eolfilled", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexGo.c
+++ b/src/StyleLexers/styleLexGo.c
@ -44,4 +44,4 @@ SCLEX_D, IDS_LEX_GO_SRC, L"Go Source Code", L"go", L"",
    //{ SCE_D_STRINGB, L"Default", L"", L"" },
    //{ SCE_D_STRINGR, L"Default", L"", L"" },
    //C++: { MULTI_STYLE(SCE_C_PREPROCESSOR,SCE_C_PREPROCESSORCOMMENT,SCE_C_PREPROCESSORCOMMENTDOC,0), IDS_LEX_STR_63133, L"Preprocessor", L"fore:#FF8000", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexHTML.c
+++ b/src/StyleLexers/styleLexHTML.c
@ -141,5 +141,5 @@ SCLEX_HTML, IDS_LEX_WEB_SRC, L"Web Source Code", L"html; htm; asp; aspx; shtml;
    //{ SCE_HPA_DEFNAME, L"ASP Phyton Def Name", L"", L"" },
    //{ SCE_HPA_OPERATOR, L"ASP Phyton Operator", L"", L"" },
    //{ SCE_HPA_IDENTIFIER, L"ASP Phyton Identifier", L"", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };

--- a/src/StyleLexers/styleLexINNO.c
+++ b/src/StyleLexers/styleLexINNO.c
@ -53,4 +53,4 @@ SCLEX_INNOSETUP, IDS_LEX_INNO, L"Inno Setup Script", L"iss; isl; islu", L"",
    { MULTI_STYLE(SCE_INNO_STRING_DOUBLE,SCE_INNO_STRING_SINGLE,0,0), IDS_LEX_STR_63131, L"String", L"", L"" },
    //{ SCE_INNO_IDENTIFIER, IDS_LEX_STR_63129, L"Identifier", L"", L"" },
    //{ SCE_INNO_KEYWORD_USER, L"User Defined", L"", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexJAVA.c
+++ b/src/StyleLexers/styleLexJAVA.c
@ -30,4 +30,4 @@ SCLEX_CPP, IDS_LEX_JAVA_SRC, L"Java Source Code", L"java", L"",
    //{ SCE_C_PREPROCESSOR, L"Preprocessor", L"fore:#FF8000", L"" },
    //{ SCE_C_WORD2, L"Word 2", L"", L"" },
    //{ SCE_C_GLOBALCLASS, L"Global Class", L"", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexJS.c
+++ b/src/StyleLexers/styleLexJS.c
@ -25,5 +25,5 @@ SCLEX_CPP, IDS_LEX_J_SCR, L"JavaScript", L"js; jse; jsm; as", L"",
    //{ SCE_C_PREPROCESSOR, L"Preprocessor", L"fore:#FF8000", L"" },
    //{ SCE_C_WORD2, L"Word 2", L"", L"" },
    //{ SCE_C_GLOBALCLASS, L"Global Class", L"", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };

--- a/src/StyleLexers/styleLexJSON.c
+++ b/src/StyleLexers/styleLexJSON.c
@ -18,7 +18,7 @@ SCLEX_JSON, IDS_LEX_JSON, L"JSON", L"json; eslintrc; jshintrc; jsonld", L"",
    { SCE_C_REGEX, IDS_LEX_STR_63135, L"Regex", L"fore:#006633; back:#FFF1A8", L"" },
    { SCE_JSON_NUMBER, IDS_LEX_STR_63130, L"Number", L"fore:#FF0000", L"" },
    { SCE_C_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"fore:#B000B0", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };

 /*
 # String
--- a/src/StyleLexers/styleLexLUA.c
+++ b/src/StyleLexers/styleLexLUA.c
@ -46,4 +46,4 @@ SCLEX_LUA, IDS_LEX_LUA, L"Lua Script", L"lua", L"",
    { SCE_LUA_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"", L"" },
    { SCE_LUA_IDENTIFIER, IDS_LEX_STR_63129, L"Identifier", L"", L"" },
    { SCE_LUA_LABEL, IDS_LEX_STR_63235, L"Label", L"fore:#808000", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexMAK.c
+++ b/src/StyleLexers/styleLexMAK.c
@ -14,4 +14,4 @@ SCLEX_MAKEFILE, IDS_LEX_MAKEFILES, L"Makefiles", L"mak; make; mk; dsp; msc; msvc
    { SCE_MAKE_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"", L"" },
    { SCE_MAKE_TARGET, IDS_LEX_STR_63204, L"Target", L"fore:#003CE6; back:#FFC000", L"" },
    { SCE_MAKE_PREPROCESSOR, IDS_LEX_STR_63133, L"Preprocessor", L"fore:#FF8000", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexMARKDOWN.c
+++ b/src/StyleLexers/styleLexMARKDOWN.c
@ -26,4 +26,4 @@ SCLEX_MARKDOWN, IDS_LEX_MARKDOWN, L"Markdown", L"md; markdown; mdown; mkdn; mkd"
    { SCE_MARKDOWN_HRULE, IDS_LEX_STR_63330, L"Horizontal Rule", L"bold", L"" },
    { SCE_MARKDOWN_LINK, IDS_LEX_STR_63331, L"Link", L"fore:#0000FF", L"" },
    { MULTI_STYLE(SCE_MARKDOWN_CODE,SCE_MARKDOWN_CODE2,SCE_MARKDOWN_CODEBK,0), IDS_LEX_STR_63332, L"Code", L"fore:#00007F; back:#EBEBEB", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexMATLAB.c
+++ b/src/StyleLexers/styleLexMATLAB.c
@ -18,4 +18,4 @@ SCLEX_MATLAB, IDS_LEX_MATLAB, L"MATLAB", L"matlab", L"",
    { MULTI_STYLE(SCE_MATLAB_STRING,SCE_MATLAB_DOUBLEQUOTESTRING,0,0), IDS_LEX_STR_63131, L"String", L"fore:#7F007F", L"" },
    { SCE_MATLAB_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"", L"" },
    { SCE_MATLAB_IDENTIFIER, IDS_LEX_STR_63129, L"Identifier", L"", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexNSIS.c
+++ b/src/StyleLexers/styleLexNSIS.c
@ -74,5 +74,5 @@ SCLEX_NSIS, IDS_LEX_NSIS, L"NSIS Script", L"nsi; nsh", L"",
    { SCE_NSIS_IFDEFINEDEF, IDS_LEX_STR_63279, L"If Definition", L"fore:#0033CC", L"" },
    { SCE_NSIS_MACRODEF, IDS_LEX_STR_63280, L"Macro Definition", L"fore:#0033CC", L"" },
    //{ SCE_NSIS_USERDEFINED, L"User Defined", L"", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };

--- a/src/StyleLexers/styleLexNimrod.c
+++ b/src/StyleLexers/styleLexNimrod.c
@ -23,4 +23,4 @@ EDITLEXER lexNimrod = { SCLEX_NIMROD, IDS_LEX_NIM_SRC, L"Nim Source Code", L"nim
                        { SCE_P_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"bold; fore:#666600", L"" },
                        //{ SCE_P_DEFNAME, IDS_LEX_STR_63247, L"Function name", L"fore:#660066", L"" },
                        //{ SCE_P_CLASSNAME, IDS_LEX_STR_63246, L"Class name", L"fore:#660066", L"" },
-                        { -1, 00000, L"", L"", L"" } } };
+                        EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexPAS.c
+++ b/src/StyleLexers/styleLexPAS.c
@ -23,5 +23,5 @@ SCLEX_PASCAL, IDS_LEX_PASCAL_SRC, L"Pascal Source Code", L"pas; dpr; dpk; dfm; i
    { SCE_PAS_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"bold", L"" },
    { SCE_PAS_ASM, IDS_LEX_STR_63205, L"Inline Asm", L"fore:#0000FF", L"" },
    { MULTI_STYLE(SCE_PAS_PREPROCESSOR,SCE_PAS_PREPROCESSOR2,0,0), IDS_LEX_STR_63133, L"Preprocessor", L"fore:#FF00FF", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };

--- a/src/StyleLexers/styleLexPL.c
+++ b/src/StyleLexers/styleLexPL.c
@ -62,4 +62,4 @@ SCLEX_PERL, IDS_LEX_PERL_SCR, L"Perl Script", L"pl; pm; cgi; pod", L"",
    //{ SCE_PL_PUNCTUATION, L"Symbols / Punctuation (not used)", L"", L"" },
    //{ SCE_PL_PREPROCESSOR, L"Preprocessor (not used)", L"", L"" },
    //{ SCE_PL_LONGQUOTE, L"Long Quote (qq, qr, qw, qx) (not used)", L"", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexPROPS.c
+++ b/src/StyleLexers/styleLexPROPS.c
@ -13,4 +13,4 @@ SCLEX_PROPERTIES, IDS_LEX_CONF, L"Configuration Files", L"ini; inf; cfg; propert
    { SCE_PROPS_SECTION, IDS_LEX_STR_63232, L"Section", L"fore:#000000; back:#FF8040; bold; eolfilled", L"" },
    { SCE_PROPS_ASSIGNMENT, IDS_LEX_STR_63233, L"Assignment", L"fore:#FF0000", L"" },
    { SCE_PROPS_DEFVAL, IDS_LEX_STR_63234, L"Default Value", L"fore:#FF0000", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexPS.c
+++ b/src/StyleLexers/styleLexPS.c
@ -70,4 +70,4 @@ SCLEX_POWERSHELL, IDS_LEX_PWRSHELL, L"PowerShell Script", L"ps1; psd1; psm1", L"
    { SCE_POWERSHELL_VARIABLE, IDS_LEX_STR_63249, L"Variable", L"fore:#0A246A", L"" },
    { MULTI_STYLE(SCE_POWERSHELL_CMDLET,SCE_POWERSHELL_FUNCTION,0,0), IDS_LEX_STR_63250, L"Cmdlet", L"fore:#804000; back:#FFF1A8", L"" },
    { SCE_POWERSHELL_ALIAS, IDS_LEX_STR_63251, L"Alias", L"bold; fore:#0A246A", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexPY.c
+++ b/src/StyleLexers/styleLexPY.c
@ -23,4 +23,4 @@ SCLEX_PYTHON, IDS_LEX_PYTHON, L"Python Script", L"py; pyw", L"",
    { SCE_P_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"bold; fore:#666600", L"" },
    { SCE_P_DEFNAME, IDS_LEX_STR_63247, L"Function Name", L"fore:#660066", L"" },
    { SCE_P_CLASSNAME, IDS_LEX_STR_63246, L"Class Name", L"fore:#660066", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexR.c
+++ b/src/StyleLexers/styleLexR.c
@ -91,4 +91,4 @@ SCLEX_R, IDS_LEX_R_STAT, L"R-S-SPlus Statistics Code", L"R", L"",
    { SCE_R_IDENTIFIER, IDS_LEX_STR_63129, L"Identifier", L"", L"" },
    { SCE_R_INFIX, IDS_LEX_STR_63269, L"Infix", L"fore:#660066", L"" },
    { SCE_R_INFIXEOL, IDS_LEX_STR_63270, L"Infix EOL", L"fore:#FF4000; ,back:#E0C0E0; eolfilled", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexRC.c
+++ b/src/StyleLexers/styleLexRC.c
@ -28,4 +28,4 @@ SCLEX_CPP, IDS_LEX_RESOURCE_SCR, L"Resource Script", L"rc; rc2; rct; rh; r; dlg"
    //{ SCE_C_REGEX, L"Regex", L"", L"" },
    //{ SCE_C_WORD2, L"Word 2", L"", L"" },
    //{ SCE_C_GLOBALCLASS, L"Global Class", L"", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexRUBY.c
+++ b/src/StyleLexers/styleLexRUBY.c
@ -26,4 +26,4 @@ SCLEX_RUBY, IDS_LEX_RUBY, L"Ruby Script", L"rb; ruby; rbw; rake; rjs; Rakefile;
    { SCE_RB_INSTANCE_VAR, IDS_LEX_STR_63295, L"Instance Var", L"fore:#B00080", L"" },
    { SCE_RB_CLASS_VAR, IDS_LEX_STR_63296, L"Class Var", L"fore:#8000B0", L"" },
    { SCE_RB_DATASECTION, IDS_LEX_STR_63222, L"Data Section", L"fore:#600000; back:#FFF0D8; eolfilled", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexRegistry.c
+++ b/src/StyleLexers/styleLexRegistry.c
@ -19,4 +19,4 @@ SCLEX_REGISTRY, IDS_LEX_REG_FILES, L"Registry Files", L"reg", L"",
    { SCE_REG_KEYPATH_GUID, IDS_LEX_STR_63291, L"GUID in Key Path", L"fore:#7B5F15", L"" },
    { SCE_REG_PARAMETER, IDS_LEX_STR_63281, L"Parameter", L"fore:#0B6561", L"" },
    { SCE_REG_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"bold", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexRust.c
+++ b/src/StyleLexers/styleLexRust.c
@ -43,4 +43,4 @@ SCLEX_RUST, IDS_LEX_RUST_SRC, L"Rust Source Code", L"rs; rust", L"",
    { SCE_RUST_LIFETIME, IDS_LEX_STR_63346, L"Rust Lifetime", L"fore:#B000B0", L"" },
    { SCE_RUST_LEXERROR, IDS_LEX_STR_63252, L"Parsing Error", L"fore:#F0F0F0; back:#F00000", L"" },
    { MULTI_STYLE(SCE_RUST_BYTESTRING,SCE_RUST_BYTESTRINGR,SCE_RUST_BYTECHARACTER,0), IDS_LEX_STR_63344, L"Byte String", L"fore:#C0C0C0", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexSQL.c
+++ b/src/StyleLexers/styleLexSQL.c
@ -38,4 +38,4 @@ SCLEX_SQL, IDS_LEX_SQL, L"SQL Query", L"sql", L"",
    { SCE_SQL_QUOTEDIDENTIFIER, IDS_LEX_STR_63243, L"Quoted Identifier", L"fore:#800080; back:#FFCCFF", L"" },
    { SCE_SQL_NUMBER, IDS_LEX_STR_63130, L"Number", L"fore:#FF0000", L"" },
    { SCE_SQL_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"bold; fore:#800080", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexStandard.c
+++ b/src/StyleLexers/styleLexStandard.c
@ -21,7 +21,8 @@ SCLEX_NULL, IDS_LEX_DEF_TXT, L"Default Text", L"txt; text; wtx; log; asc; doc",
    /* 12 */ { SCI_FOLDALL+SCI_MARKERSETALPHA, IDS_LEX_STD_BKMRK, L"Bookmarks and Folding (Colors, Size)", L"size:+2; fore:#000000; back:#808080; alpha:80", L"" },
    /* 13 */ { SCI_MARKERSETBACK+SCI_MARKERSETALPHA, IDS_LEX_STR_63262, L"Mark Occurrences (Indicator)", L"alpha:100; alpha2:100; indic_roundbox", L"" },
    /* 14 */ { SCI_SETHOTSPOTACTIVEFORE, IDS_LEX_STR_63264, L"Hyperlink Hotspots", L"italic; fore:#0000FF", L"" },
-             { -1, 00000, L"", L"", L"" } } };
+    /* 15 */ { SCI_INDICSETFORE, IDS_LEX_STR_63352, L"Inline-IME Color", L"fore:#00FF00", L"" },
+             EDITLEXER_SENTINEL } };


 EDITLEXER lexStandard2nd = { 
@ -42,7 +43,8 @@ SCLEX_NULL, IDS_LEX_STR_63266, L"2nd Default Text", L"txt; text; wtx; log; asc;
    /* 12 */ { SCI_FOLDALL + SCI_MARKERSETALPHA, IDS_LEX_2ND_BKMRK, L"2nd Bookmarks and Folding (Colors, Size)", L"size:+2; fore:#000000; back:#808080; alpha:80; charset:2; case:U", L"" },
    /* 13 */ { SCI_MARKERSETBACK + SCI_MARKERSETALPHA, IDS_LEX_STR_63263, L"2nd Mark Occurrences (Indicator)", L"fore:#0x000000; alpha:100; alpha2:220; indic_box", L"" },
    /* 14 */ { SCI_SETHOTSPOTACTIVEFORE, IDS_LEX_STR_63265, L"2nd Hyperlink Hotspots", L"bold; fore:#FF0000", L"" },
-             { -1, 00000, L"", L"", L"" } } };
+    /* 15 */ { SCI_INDICSETFORE, IDS_LEX_STR_63353, L"2nd Inline-IME Color", L"fore:#FF0000", L"" },
+             EDITLEXER_SENTINEL } };


 EDITLEXER lexANSI = { 
@ -53,7 +55,7 @@ SCLEX_NULL, IDS_LEX_ANSI_ART, L"ANSI Art", L"nfo; diz", L"",
    { STYLE_BRACELIGHT, IDS_LEX_STD_BRACE, L"Matching Braces", L"size:+0", L"" },
    { STYLE_BRACEBAD, IDS_LEX_STD_BRACE_FAIL, L"Matching Braces Error", L"size:+0", L"" },
    { SCI_SETEXTRAASCENT + SCI_SETEXTRADESCENT, IDS_LEX_STD_X_SPC, L"Extra Line Spacing (Size)", L"size:-1", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };


 EDITLEXER lexLATEX = { 
@ -67,7 +69,7 @@ SCLEX_LATEX, IDS_LEX_LATEX, L"LaTeX Files", L"tex; latex; sty", L"",
    { SCE_L_SPECIAL, IDS_LEX_STR_63306, L"Special Char", L"fore:#AAAA00", L"" },
    { MULTI_STYLE(SCE_L_TAG,SCE_L_TAG2,0,0), IDS_LEX_STR_63282, L"Tag", L"fore:#0000FF", L"" },
    { SCE_L_VERBATIM, IDS_LEX_STR_63307, L"Verbatim Segment", L"fore:#666666", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };



--- a/src/StyleLexers/styleLexTCL.c
+++ b/src/StyleLexers/styleLexTCL.c
@ -43,5 +43,5 @@ SCLEX_TCL, IDS_LEX_TCL, L"Tcl Script", L"tcl; itcl", L"",
    { SCE_TCL_IDENTIFIER, IDS_LEX_STR_63129, L"Identifier", L"fore:#800080", L"" },
    { SCE_TCL__MULTI_SUBSTITUTION, IDS_LEX_STR_63274, L"Substitution", L"fore:#CC0000", L"" },
    { SCE_TCL_MODIFIER, IDS_LEX_STR_63275, L"Modifier", L"fore:#FF00FF", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };

--- a/src/StyleLexers/styleLexVB.c
+++ b/src/StyleLexers/styleLexVB.c
@ -32,4 +32,4 @@ SCLEX_VB, IDS_LEX_VIS_BAS, L"Visual Basic", L"vb; bas; frm; cls; ctl; pag; dsr;
    //{ SCE_B_KEYWORD3, L"Keyword 3", L"", L"" },
    //{ SCE_B_KEYWORD4, L"Keyword 4", L"", L"" },
    //{ SCE_B_ASM, L"Inline Asm", L"fore:#FF8000", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexVBS.c
+++ b/src/StyleLexers/styleLexVBS.c
@ -28,4 +28,4 @@ SCLEX_VBSCRIPT, IDS_LEX_VB_SCR, L"VBScript", L"vbs; dsm", L"",
    //{ SCE_B_KEYWORD3, L"Keyword 3", L"", L"" },
    //{ SCE_B_KEYWORD4, L"Keyword 4", L"", L"" },
    //{ SCE_B_ASM, L"Inline Asm", L"fore:#FF8000", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexVHDL.c
+++ b/src/StyleLexers/styleLexVHDL.c
@ -34,4 +34,4 @@ SCLEX_VHDL, IDS_LEX_VHDL, L"VHDL", L"vhdl; vhd", L"",
    { SCE_VHDL_STDFUNCTION, IDS_LEX_STR_63338, L"Standard Function", L"", L"" },
    { SCE_VHDL_STDPACKAGE, IDS_LEX_STR_63339, L"Standard Package", L"", L"" },
    { SCE_VHDL_STDTYPE, IDS_LEX_STR_63340, L"Standard Type", L"fore:#FF8000", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };
--- a/src/StyleLexers/styleLexXML.c
+++ b/src/StyleLexers/styleLexXML.c
@ -20,6 +20,6 @@ SCLEX_XML, IDS_LEX_XML_DOC, L"XML Document", L"xml; xsl; rss; svg; xul; xsd; xsl
    { MULTI_STYLE(SCE_H_XMLSTART,SCE_H_XMLEND,0,0), IDS_LEX_STR_63145, L"XML Identifier", L"bold; fore:#881280", L"" },
    { SCE_H_SGML_DEFAULT, IDS_LEX_STR_63237, L"SGML", L"fore:#881280", L"" },
    { SCE_H_CDATA, IDS_LEX_STR_63147, L"CDATA", L"fore:#646464", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };


--- a/src/StyleLexers/styleLexYAML.c
+++ b/src/StyleLexers/styleLexYAML.c
@ -17,4 +17,4 @@ SCLEX_YAML, IDS_LEX_YAML, L"YAML", L"yaml; yml", L"",
    { SCE_YAML_TEXT, IDS_LEX_STR_63335, L"Text", L"fore:#404040", L"" },
    { SCE_YAML_ERROR, IDS_LEX_STR_63261, L"Error", L"fore:#FFFFFF; bold; italic; back:#FF0000; eolfilled", L"" },
    { SCE_YAML_OPERATOR, IDS_LEX_STR_63132, L"Operator", L"fore:#333366", L"" },
-    { -1, 00000, L"", L"", L"" } } };
+    EDITLEXER_SENTINEL } };