From 18cbea9702ae7a31dbb736bd9444fcff3983fd12 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Fri, 19 Jan 2018 18:43:39 +0100 Subject: [PATCH] + cleanup: tidyup Customize Schemes... Style Namings --- src/Notepad3.rc | 50 ++++++++++---------- src/Styles.c | 122 ++++++++++++++++++++++++------------------------ 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/Notepad3.rc b/src/Notepad3.rc index 1b1ee9a9c..27cc9bb14 100644 --- a/src/Notepad3.rc +++ b/src/Notepad3.rc @@ -1745,8 +1745,8 @@ BEGIN 63121 "2nd Caret (Color, Size 1-3)" 63122 "2nd Long Line Marker (Colors)" 63123 "2nd Extra Line Spacing (Size)" - 63124 "Book Marks (Colors)" - 63125 "2nd Book Marks (Colors)" + 63124 "Bookmarks (Colors)" + 63125 "2nd Bookmarks (Colors)" 63126 "Default" 63127 "Comment" 63128 "Keyword" @@ -1834,8 +1834,8 @@ BEGIN 63194 "Tag-Class" 63195 "Tag-Id" 63196 "Tag-Attribute" - 63197 "Pseudo-class" - 63198 "Unknown Pseudo-class" + 63197 "Pseudo-Class" + 63198 "Unknown Pseudo-Class" 63199 "CSS Property" END @@ -1852,10 +1852,10 @@ BEGIN 63208 "Register" 63209 "Directive Operand" 63210 "Extended Instruction" - 63211 "String double quoted" - 63212 "String single quoted" - 63213 "POD (common)" - 63214 "POD (verbatim)" + 63211 "String Double Quoted" + 63212 "String Single Quoted" + 63213 "POD (Common)" + 63214 "POD (Verbatim)" 63215 "Scalar $var" END @@ -1863,18 +1863,18 @@ STRINGTABLE BEGIN 63216 "Array @var" 63217 "Hash %var" - 63218 "Symbol table *var" + 63218 "Symbol Table *var" 63219 "Regex /re/ or m{re}" 63220 "Substitution s/re/ore/" - 63221 "Back ticks" - 63222 "Data section" - 63223 "Here-doc (delimiter)" - 63224 "Here-doc (single quoted, q)" - 63225 "Here-doc (double quoted, qq)" - 63226 "Here-doc (back ticks, qx)" - 63227 "Single quoted string (generic, q)" - 63228 "Double quoted string (qq)" - 63229 "Back ticks (qx)" + 63221 "Back Ticks" + 63222 "Data Section" + 63223 "Here-Doc (Delimiter)" + 63224 "Here-Doc (Single Quoted, q)" + 63225 "Here-Doc (Double Quoted, qq)" + 63226 "Here-Doc (Back Ticks, qx)" + 63227 "Single Quoted String (Generic, q)" + 63228 "Double Quoted String (qq)" + 63229 "Back Ticks (qx)" 63230 "Regex (qr)" 63231 "Array (qw)" END @@ -1893,10 +1893,10 @@ BEGIN 63241 "Line Removal" 63242 "Line Change" 63243 "Quoted Identifier" - 63244 "String triple double quotes" - 63245 "String triple single quotes" - 63246 "Class name" - 63247 "Function name" + 63244 "String Triple Double Quotes" + 63245 "String Triple Single Quotes" + 63246 "Class Name" + 63247 "Function Name" END STRINGTABLE @@ -1905,10 +1905,10 @@ BEGIN 63249 "Variable" 63250 "Cmdlet" 63251 "Alias" - 63252 "Parsing error" + 63252 "Parsing Error" 63253 "Prototype" - 63254 "Format identifier" - 63255 "Format body" + 63254 "Format Identifier" + 63255 "Format Body" 63256 "HTML Element Text" 63257 "XML Element Text" 63258 "Typedefs/Classes" diff --git a/src/Styles.c b/src/Styles.c index 761a5f007..eb61fb751 100644 --- a/src/Styles.c +++ b/src/Styles.c @@ -74,7 +74,7 @@ EDITLEXER lexStandard = { SCLEX_NULL, 63000, L"Default Text", L"txt; text; wtx; /* 9 */ { SCI_SETCARETFORE+SCI_SETCARETWIDTH, 63109, L"Caret (Color, Size 1-3)", L"", L"" }, /* 10 */ { SCI_SETEDGECOLOUR, 63110, L"Long Line Marker (Colors)", L"fore:#FFC000", L"" }, /* 11 */ { SCI_SETEXTRAASCENT+SCI_SETEXTRADESCENT, 63111, L"Extra Line Spacing (Size)", L"size:2", L"" }, - /* 12 */ { SCI_MARKERSETBACK+SCI_MARKERSETALPHA, 63124, L"Book Marks (Colors)", L"back:#00FF00; alpha:20", L"" }, + /* 12 */ { SCI_MARKERSETBACK+SCI_MARKERSETALPHA, 63124, L"Bookmarks (Colors)", L"back:#00FF00; alpha:20", L"" }, /* 13 */ { SCI_MARKERSETBACK+SCI_MARKERSETALPHA, 63262, L"Mark Occurrences (Indicator)", L"indic_roundbox", L"" }, /* 14 */ { SCI_SETHOTSPOTACTIVEFORE, 63264, L"Hyperlink Hotspots", L"italic; fore:#0000FF", L"" }, { -1, 00000, L"", L"", L"" } } }; @@ -93,7 +93,7 @@ EDITLEXER lexStandard2nd = { SCLEX_NULL, 63266, L"2nd Default Text", L"txt; text /* 9 */ { SCI_SETCARETFORE + SCI_SETCARETWIDTH, 63121, L"2nd Caret (Color, Size 1-3)", L"", L"" }, /* 10 */ { SCI_SETEDGECOLOUR, 63122, L"2nd Long Line Marker (Colors)", L"fore:#FFC000", L"" }, /* 11 */ { SCI_SETEXTRAASCENT + SCI_SETEXTRADESCENT, 63123, L"2nd Extra Line Spacing (Size)", L"", L"" }, - /* 12 */ { SCI_MARKERSETBACK + SCI_MARKERSETALPHA, 63125, L"2nd Book Marks (Colors)", L"back:#00FF00; alpha:20", L"" }, + /* 12 */ { SCI_MARKERSETBACK + SCI_MARKERSETALPHA, 63125, L"2nd Bookmarks (Colors)", L"back:#00FF00; alpha:20", L"" }, /* 13 */ { SCI_MARKERSETBACK + SCI_MARKERSETALPHA, 63263, L"2nd Mark Occurrences (Indicator)", L"fore:#0x00FF00; alpha:100; alpha2:220; indic_box", L"" }, /* 14 */ { SCI_SETHOTSPOTACTIVEFORE, 63265, L"2nd Hyperlink Hotspots", L"bold; fore:#FF0000", L"" }, { -1, 00000, L"", L"", L"" } } }; @@ -351,8 +351,8 @@ EDITLEXER lexCSS = { SCLEX_CSS, 63003, L"CSS Style Sheets", L"css; less; sass; s { SCE_CSS_CLASS, 63194, L"Tag-Class", L"fore:#648000", L"" }, { SCE_CSS_ID, 63195, L"Tag-Id", L"fore:#648000", L"" }, { SCE_CSS_ATTRIBUTE, 63196, L"Tag-Attribute", L"italic; fore:#648000", L"" }, - { MULTI_STYLE(SCE_CSS_PSEUDOCLASS,SCE_CSS_EXTENDED_PSEUDOCLASS,0,0), 63197, L"Pseudo-class", L"fore:#B000B0", L"" }, - { MULTI_STYLE(SCE_CSS_PSEUDOELEMENT,SCE_CSS_EXTENDED_PSEUDOELEMENT,0,0), 63361, L"Pseudo-element", L"fore:#B00050", L"" }, + { MULTI_STYLE(SCE_CSS_PSEUDOCLASS,SCE_CSS_EXTENDED_PSEUDOCLASS,0,0), 63197, L"Pseudo-Class", L"fore:#B000B0", L"" }, + { MULTI_STYLE(SCE_CSS_PSEUDOELEMENT,SCE_CSS_EXTENDED_PSEUDOELEMENT,0,0), 63361, L"Pseudo-Element", L"fore:#B00050", L"" }, { MULTI_STYLE(SCE_CSS_IDENTIFIER,SCE_CSS_IDENTIFIER2,SCE_CSS_IDENTIFIER3,SCE_CSS_EXTENDED_IDENTIFIER), 63199, L"CSS Property", L"fore:#FF4000", L"" }, { MULTI_STYLE(SCE_CSS_DOUBLESTRING,SCE_CSS_SINGLESTRING,0,0), 63131, L"String", L"fore:#008000", L"" }, { SCE_CSS_VALUE, 63201, L"Value", L"fore:#3A6EA5", L"" }, @@ -361,7 +361,7 @@ EDITLEXER lexCSS = { SCLEX_CSS, 63003, L"CSS Style Sheets", L"css; less; sass; s { SCE_CSS_DIRECTIVE, 63203, L"Directive", L"bold; fore:#000000; back:#FFF1A8", L"" }, { SCE_CSS_MEDIA, 63382, L"Media", L"bold; fore:#0A246A", L"" }, { SCE_CSS_VARIABLE, 63249, L"Variable", L"bold; fore:#FF4000", L"" }, - { SCE_CSS_UNKNOWN_PSEUDOCLASS, 63198, L"Unknown Pseudo-class", L"fore:#C80000; back:#FFFF80", L"" }, + { SCE_CSS_UNKNOWN_PSEUDOCLASS, 63198, L"Unknown Pseudo-Class", L"fore:#C80000; back:#FFFF80", L"" }, { SCE_CSS_UNKNOWN_IDENTIFIER, 63200, L"Unknown Property", L"fore:#C80000; back:#FFFF80", L"" }, { -1, 00000, L"", L"", L"" } } }; @@ -937,36 +937,36 @@ EDITLEXER lexPL = { SCLEX_PERL, 63014, L"Perl Script", L"pl; pm; cgi; pod", L"", { SCE_PL_COMMENTLINE, 63127, L"Comment", L"fore:#646464", L"" }, { SCE_PL_WORD, 63128, L"Keyword", L"bold; fore:#804000", L"" }, { SCE_PL_IDENTIFIER, 63129, L"Identifier", L"", L"" }, - { SCE_PL_STRING, 63211, L"String double quoted", L"fore:#008000", L"" }, - { SCE_PL_CHARACTER, 63212, L"String single quoted", L"fore:#008000", L"" }, + { SCE_PL_STRING, 63211, L"String Double Quoted", L"fore:#008000", L"" }, + { SCE_PL_CHARACTER, 63212, L"String Single Quoted", L"fore:#008000", L"" }, { SCE_PL_NUMBER, 63130, L"Number", L"fore:#FF0000", L"" }, { SCE_PL_OPERATOR, 63132, L"Operator", L"bold", L"" }, { SCE_PL_SCALAR, 63215, L"Scalar $var", L"fore:#0A246A", L"" }, { SCE_PL_ARRAY, 63216, L"Array @var", L"fore:#003CE6", L"" }, { SCE_PL_HASH, 63217, L"Hash %var", L"fore:#B000B0", L"" }, - { SCE_PL_SYMBOLTABLE, 63218, L"Symbol table *var", L"fore:#3A6EA5", L"" }, + { SCE_PL_SYMBOLTABLE, 63218, L"Symbol Table *var", L"fore:#3A6EA5", L"" }, { SCE_PL_REGEX, 63219, L"Regex /re/ or m{re}", L"fore:#006633; back:#FFF1A8", L"" }, { SCE_PL_REGSUBST, 63220, L"Substitution s/re/ore/", L"fore:#006633; back:#FFF1A8", L"" }, - { SCE_PL_BACKTICKS, 63221, L"Back ticks", L"fore:#E24000; back:#FFF1A8", L"" }, - { SCE_PL_HERE_DELIM, 63223, L"Here-doc (delimiter)", L"fore:#648000", L"" }, - { SCE_PL_HERE_Q, 63224, L"Here-doc (single quoted, q)", L"fore:#648000", L"" }, - { SCE_PL_HERE_QQ, 63225, L"Here-doc (double quoted, qq)", L"fore:#648000", L"" }, - { SCE_PL_HERE_QX, 63226, L"Here-doc (back ticks, qx)", L"fore:#E24000; back:#FFF1A8", L"" }, - { SCE_PL_STRING_Q, 63227, L"Single quoted string (generic, q)", L"fore:#008000", L"" }, - { SCE_PL_STRING_QQ, 63228, L"Double quoted string (qq)", L"fore:#008000", L"" }, - { SCE_PL_STRING_QX, 63229, L"Back ticks (qx)", L"fore:#E24000; back:#FFF1A8", L"" }, + { SCE_PL_BACKTICKS, 63221, L"Back Ticks", L"fore:#E24000; back:#FFF1A8", L"" }, + { SCE_PL_HERE_DELIM, 63223, L"Here-Doc (Delimiter)", L"fore:#648000", L"" }, + { SCE_PL_HERE_Q, 63224, L"Here-Doc (Single Quoted, q)", L"fore:#648000", L"" }, + { SCE_PL_HERE_QQ, 63225, L"Here-Doc (Double Quoted, qq)", L"fore:#648000", L"" }, + { SCE_PL_HERE_QX, 63226, L"Here-Doc (Back Ticks, qx)", L"fore:#E24000; back:#FFF1A8", L"" }, + { SCE_PL_STRING_Q, 63227, L"Single Quoted String (Generic, q)", L"fore:#008000", L"" }, + { SCE_PL_STRING_QQ, 63228, L"Double Quoted String (qq)", L"fore:#008000", L"" }, + { SCE_PL_STRING_QX, 63229, L"Back Ticks (qx)", L"fore:#E24000; back:#FFF1A8", L"" }, { SCE_PL_STRING_QR, 63230, L"Regex (qr)", L"fore:#006633; back:#FFF1A8", L"" }, { SCE_PL_STRING_QW, 63231, L"Array (qw)", L"fore:#003CE6", L"" }, { SCE_PL_SUB_PROTOTYPE, 63253, L"Prototype", L"fore:#800080; back:#FFE2FF", L"" }, - { SCE_PL_FORMAT_IDENT, 63254, L"Format identifier", L"bold; fore:#648000; back:#FFF1A8", L"" }, - { SCE_PL_FORMAT, 63255, L"Format body", L"fore:#648000; back:#FFF1A8", L"" }, - { SCE_PL_POD, 63213, L"POD (common)", L"fore:#A46000; back:#FFFFC0; eolfilled", L"" }, - { SCE_PL_POD_VERB, 63214, L"POD (verbatim)", L"fore:#A46000; back:#FFFFC0; eolfilled", L"" }, - { SCE_PL_DATASECTION, 63222, L"Data section", L"fore:#A46000; back:#FFFFC0; eolfilled", L"" }, - { SCE_PL_ERROR, 63252, L"Parsing error", L"fore:#C80000; back:#FFFF80", L"" }, - //{ SCE_PL_PUNCTUATION, L"Symbols / punctuation (not used)", L"", L"" }, + { SCE_PL_FORMAT_IDENT, 63254, L"Format Identifier", L"bold; fore:#648000; back:#FFF1A8", L"" }, + { SCE_PL_FORMAT, 63255, L"Format Body", L"fore:#648000; back:#FFF1A8", L"" }, + { SCE_PL_POD, 63213, L"POD (Common)", L"fore:#A46000; back:#FFFFC0; eolfilled", L"" }, + { SCE_PL_POD_VERB, 63214, L"POD (Verbatim)", L"fore:#A46000; back:#FFFFC0; eolfilled", L"" }, + { SCE_PL_DATASECTION, 63222, L"Data Section", L"fore:#A46000; back:#FFFFC0; eolfilled", L"" }, + { SCE_PL_ERROR, 63252, L"Parsing Error", L"fore:#C80000; back:#FFFF80", 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"" }, + //{ SCE_PL_LONGQUOTE, L"Long Quote (qq, qr, qw, qx) (not used)", L"", L"" }, { -1, 00000, L"", L"", L"" } } }; @@ -1079,14 +1079,14 @@ EDITLEXER lexPY = { SCLEX_PYTHON, 63019, L"Python Script", L"py; pyw", L"", &Key { MULTI_STYLE(SCE_P_COMMENTLINE,SCE_P_COMMENTBLOCK,0,0), 63127, L"Comment", L"fore:#880000", L"" }, { SCE_P_WORD, 63128, L"Keyword", L"fore:#000088", L"" }, { SCE_P_IDENTIFIER, 63129, L"Identifier", L"", L"" }, - { MULTI_STYLE(SCE_P_STRING,SCE_P_STRINGEOL,0,0), 63211, L"String double quoted", L"fore:#008800", L"" }, - { SCE_P_CHARACTER, 63212, L"String single quoted", L"fore:#008800", L"" }, - { SCE_P_TRIPLEDOUBLE, 63244, L"String triple double quotes", L"fore:#008800", L"" }, - { SCE_P_TRIPLE, 63245, L"String triple single quotes", L"fore:#008800", L"" }, + { MULTI_STYLE(SCE_P_STRING,SCE_P_STRINGEOL,0,0), 63211, L"String Double Quoted", L"fore:#008800", L"" }, + { SCE_P_CHARACTER, 63212, L"String Single Quoted", L"fore:#008800", L"" }, + { SCE_P_TRIPLEDOUBLE, 63244, L"String Triple Double Quotes", L"fore:#008800", L"" }, + { SCE_P_TRIPLE, 63245, L"String Triple Single Quotes", L"fore:#008800", L"" }, { SCE_P_NUMBER, 63130, L"Number", L"fore:#FF4000", L"" }, { SCE_P_OPERATOR, 63132, L"Operator", L"bold; fore:#666600", L"" }, - { SCE_P_DEFNAME, 63247, L"Function name", L"fore:#660066", L"" }, - { SCE_P_CLASSNAME, 63246, L"Class name", L"fore:#660066", L"" }, + { SCE_P_DEFNAME, 63247, L"Function Name", L"fore:#660066", L"" }, + { SCE_P_CLASSNAME, 63246, L"Class Name", L"fore:#660066", L"" }, { -1, 00000, L"", L"", L"" } } }; @@ -1433,12 +1433,12 @@ EDITLEXER lexRUBY = { SCLEX_RUBY, 63032, L"Ruby Script", L"rb; ruby; rbw; rake; { SCE_RB_NUMBER, 63130, L"Number", L"fore:#008080", L"" }, { SCE_RB_OPERATOR, 63132, L"Operator", L"", L"" }, { MULTI_STYLE(SCE_RB_STRING,SCE_RB_CHARACTER,SCE_P_STRINGEOL,0), 63131, L"String", L"fore:#FF8000", L"" }, - { SCE_RB_CLASSNAME, 63246, L"Class name", L"fore:#0000FF", L"" }, - { SCE_RB_DEFNAME, 63247, L"Function name", L"fore:#007F7F", L"" }, + { SCE_RB_CLASSNAME, 63246, L"Class Name", L"fore:#0000FF", L"" }, + { SCE_RB_DEFNAME, 63247, L"Function Name", L"fore:#007F7F", L"" }, { SCE_RB_POD, 63314, L"POD", L"fore:#004000; back:#C0FFC0; eolfilled", L"" }, { SCE_RB_REGEX, 63315, L"Regex", L"fore:#000000; back:#A0FFA0", L"" }, { SCE_RB_SYMBOL, 63316, L"Symbol", L"fore:#C0A030", L"" }, - { SCE_RB_MODULE_NAME, 63317, L"Module name", L"fore:#A000A0", L"" }, + { SCE_RB_MODULE_NAME, 63317, L"Module Name", L"fore:#A000A0", L"" }, { SCE_RB_INSTANCE_VAR, 63318, L"Instance Var", L"fore:#B00080", L"" }, { SCE_RB_CLASS_VAR, 63319, L"Class Var", L"fore:#8000B0", L"" }, { SCE_RB_DATASECTION, 63320, L"Data Section", L"fore:#600000; back:#FFF0D8; eolfilled", L"" }, @@ -1516,15 +1516,15 @@ EDITLEXER lexBASH = { SCLEX_BASH, 63026, L"Shell Script", L"sh", L"", &KeyWords_ { SCE_SH_COMMENTLINE, 63127, L"Comment", L"fore:#008000", L"" }, { SCE_SH_NUMBER, 63130, L"Number", L"fore:#008080", L"" }, { SCE_SH_WORD, 63128, L"Keyword", L"fore:#0000FF", L"" }, - { SCE_SH_STRING, 63211, L"String double quoted", L"fore:#008080", L"" }, - { SCE_SH_CHARACTER, 63212, L"String single quoted", L"fore:#800080", L"" }, + { SCE_SH_STRING, 63211, L"String Double Quoted", L"fore:#008080", L"" }, + { SCE_SH_CHARACTER, 63212, L"String Single Quoted", L"fore:#800080", L"" }, { SCE_SH_OPERATOR, 63132, L"Operator", L"", L"" }, { SCE_SH_IDENTIFIER, 63129, L"Identifier", L"", L"" }, { SCE_SH_SCALAR, 63268, L"Scalar", L"fore:#808000", L"" }, - { SCE_SH_PARAM, 63269, L"Parameter expansion", L"fore:#808000; back:#FFFF99", L"" }, + { SCE_SH_PARAM, 63269, L"Parameter Expansion", L"fore:#808000; back:#FFFF99", L"" }, { SCE_SH_BACKTICKS, 63270, L"Back Ticks", L"fore:#FF0080", L"" }, - { SCE_SH_HERE_DELIM, 63271, L"Here-doc (Delimiter)", L"", L"" }, - { SCE_SH_HERE_Q, 63272, L"Here-doc (Single quoted, q)", L"fore:#008080", L"" }, + { SCE_SH_HERE_DELIM, 63271, L"Here-Doc (Delimiter)", L"", L"" }, + { SCE_SH_HERE_Q, 63272, L"Here-Doc (Single Quoted, q)", L"fore:#008080", L"" }, { -1, 00000, L"", L"", L"" } } }; @@ -2369,21 +2369,21 @@ EDITLEXER lexAHK = { SCLEX_AHK, 63037, L"AutoHotkey Script", L"ahk; ia; scriptle { MULTI_STYLE(SCE_AHK_COMMENTLINE,SCE_AHK_COMMENTBLOCK,0,0), 63127, L"Comment", L"fore:#008000", L"" }, { SCE_AHK_ESCAPE, 63306, L"Escape", L"fore:#FF8000", L"" }, { SCE_AHK_SYNOPERATOR, 63307, L"Syntax Operator", L"fore:#7F200F", L"" }, - { SCE_AHK_EXPOPERATOR, 63308, L"Expression operator", L"fore:#FF4F00", L"" }, + { SCE_AHK_EXPOPERATOR, 63308, L"Expression Operator", L"fore:#FF4F00", L"" }, { SCE_AHK_STRING, 63131, L"String", L"fore:#404040", L"" }, { SCE_AHK_NUMBER, 63130, L"Number", L"fore:#2F4F7F", L"" }, { SCE_AHK_IDENTIFIER, 63129, L"Identifier", L"fore:#CF2F0F", L"" }, - { SCE_AHK_VARREF, 63309, L"Variable dereferencing", L"fore:#CF2F0F; back:#E4FFE4", L"" }, + { SCE_AHK_VARREF, 63309, L"Variable Dereferencing", L"fore:#CF2F0F; back:#E4FFE4", L"" }, { SCE_AHK_LABEL, 63235, L"Label", L"fore:#000000; back:#FFFFA1", L"" }, - { SCE_AHK_WORD_CF, 63310, L"Flow of control", L"fore:#480048; bold", L"" }, + { SCE_AHK_WORD_CF, 63310, L"Flow of Control", L"fore:#480048; bold", L"" }, { SCE_AHK_WORD_CMD, 63236, L"Command", L"fore:#004080", L"" }, { SCE_AHK_WORD_FN, 63277, L"Function", L"fore:#0F707F; italic", L"" }, { SCE_AHK_WORD_DIR, 63203, L"Directive", L"fore:#F04020; italic", L"" }, - { SCE_AHK_WORD_KB, 63311, L"Keys & buttons", L"fore:#FF00FF; bold", L"" }, - { SCE_AHK_WORD_VAR, 63312, L"Built-in Variables", L"fore:#CF00CF; italic", L"" }, + { SCE_AHK_WORD_KB, 63311, L"Keys & Buttons", L"fore:#FF00FF; bold", L"" }, + { SCE_AHK_WORD_VAR, 63312, L"Built-In Variables", L"fore:#CF00CF; italic", L"" }, { SCE_AHK_WORD_SP, 63280, L"Special", L"fore:#0000FF; italic", L"" }, //{ SCE_AHK_WORD_UD, 63106, L"User Defined", L"fore:#800020", L"" }, - { SCE_AHK_VARREFKW, 63313, L"Variable keyword", L"fore:#CF00CF; italic; back:#F9F9FF", L"" }, + { SCE_AHK_VARREFKW, 63313, L"Variable Keyword", L"fore:#CF00CF; italic; back:#F9F9FF", L"" }, { SCE_AHK_ERROR, 63261, L"Error", L"back:#FFC0C0", L"" }, { -1, 00000, L"", L"", L"" } } }; @@ -2425,10 +2425,10 @@ EDITLEXER lexCmake = { SCLEX_CMAKE, 63038, L"Cmake Script", L"cmake; ctest", L"" { SCE_CMAKE_COMMANDS, 63277, L"Function", L"fore:#00007F", L"" }, { SCE_CMAKE_PARAMETERS, 63294, L"Parameter", L"fore:#7F200F", L"" }, { SCE_CMAKE_VARIABLE, 63249, L"Variable", L"fore:#CC3300", L"" }, - { SCE_CMAKE_WHILEDEF, 63325, L"While def", L"fore:#00007F", L"" }, - { SCE_CMAKE_FOREACHDEF, 63326, L"For each def", L"fore:#00007F", L"" }, - { SCE_CMAKE_IFDEFINEDEF, 63327, L"If def", L"fore:#00007F", L"" }, - { SCE_CMAKE_MACRODEF, 63328, L"Macro def", L"fore:#00007F", L"" }, + { SCE_CMAKE_WHILEDEF, 63325, L"While Def", L"fore:#00007F", L"" }, + { SCE_CMAKE_FOREACHDEF, 63326, L"For Each Def", L"fore:#00007F", L"" }, + { SCE_CMAKE_IFDEFINEDEF, 63327, L"If Def", L"fore:#00007F", L"" }, + { SCE_CMAKE_MACRODEF, 63328, L"Macro Def", L"fore:#00007F", L"" }, { SCE_CMAKE_STRINGVAR, 63329, L"Variable within string", L"back:#EEEEEE; fore:#CC3300", L"" }, { SCE_CMAKE_NUMBER, 63130, L"Number", L"fore:#008080", L"" }, //{ SCE_CMAKE_USERDEFINED, 63106, L"User Defined", L"fore:#800020", L"" }, @@ -2521,7 +2521,7 @@ EDITLEXER lexAVS = { SCLEX_AVS, 63039, L"AviSynth Script", L"avs; avsi", L"", &K { SCE_AVS_FILTER, 63333, L"Filter", L"fore:#00007F; bold", L"" }, { SCE_AVS_PLUGIN, 63334, L"Plugin", L"fore:#0080C0; bold", L"" }, { SCE_AVS_FUNCTION, 63277, L"Function", L"fore:#007F7F", L"" }, - { SCE_AVS_CLIPPROP, 63335, L"Clip property", L"fore:#00007F", L"" }, + { SCE_AVS_CLIPPROP, 63335, L"Clip Property", L"fore:#00007F", L"" }, //{ SCE_AVS_USERDFN, 63106, L"User Defined", L"fore:#8000FF", L"" }, { -1, 00000, L"", L"", L"" } } }; @@ -2542,12 +2542,12 @@ EDITLEXER lexMARKDOWN = { SCLEX_MARKDOWN, 63040, L"Markdown", L"md; markdown; md { SCE_MARKDOWN_HEADER4, 63344, L"Header 4", L"fore:#FF0088; bold", L"" }, { SCE_MARKDOWN_HEADER5, 63345, L"Header 5", L"fore:#FF0088; bold", L"" }, { SCE_MARKDOWN_HEADER6, 63346, L"Header 6", L"fore:#FF0088; bold", L"" }, - { SCE_MARKDOWN_PRECHAR, 63347, L"Pre char", L"fore:#00007F", L"" }, - { SCE_MARKDOWN_ULIST_ITEM, 63348, L"Unordered list", L"fore:#0080FF; bold", L"" }, + { SCE_MARKDOWN_PRECHAR, 63347, L"Pre Char", L"fore:#00007F", L"" }, + { SCE_MARKDOWN_ULIST_ITEM, 63348, L"Unordered List", L"fore:#0080FF; bold", L"" }, { SCE_MARKDOWN_OLIST_ITEM, 63349, L"Ordered list", L"fore:#0080FF; bold", L"" }, - { SCE_MARKDOWN_BLOCKQUOTE, 63350, L"Block quote", L"fore:#00007F", L"" }, + { SCE_MARKDOWN_BLOCKQUOTE, 63350, L"Block Quote", L"fore:#00007F", L"" }, { SCE_MARKDOWN_STRIKEOUT, 63351, L"Strikeout", L"", L"" }, - { SCE_MARKDOWN_HRULE, 63352, L"Horizontal rule", L"bold", L"" }, + { SCE_MARKDOWN_HRULE, 63352, L"Horizontal Rule", L"bold", L"" }, { SCE_MARKDOWN_LINK, 63353, L"Link", L"fore:#0000FF", L"" }, { MULTI_STYLE(SCE_MARKDOWN_CODE,SCE_MARKDOWN_CODE2,SCE_MARKDOWN_CODEBK,0), 63354, L"Code", L"fore:#00007F; back:#EBEBEB", L"" }, { -1, 00000, L"", L"", L"" } } }; @@ -2597,11 +2597,11 @@ EDITLEXER lexVHDL = { SCLEX_VHDL, 63028, L"VHDL", L"vhdl; vhd", L"", &KeyWords_V { SCE_VHDL_OPERATOR, 63132, L"Operator", L"fore:#B000B0", L"" }, { SCE_VHDL_IDENTIFIER, 63129, L"Identifier", L"", L"" }, { SCE_VHDL_KEYWORD, 63128, L"Keyword", L"bold; fore:#0A246A", L"" }, - { SCE_VHDL_STDOPERATOR, 63371, L"Standard operator", L"bold; fore:#0A246A", L"" }, + { SCE_VHDL_STDOPERATOR, 63371, L"Standard Operator", L"bold; fore:#0A246A", L"" }, { SCE_VHDL_ATTRIBUTE, 63372, L"Attribute", L"", L"" }, - { SCE_VHDL_STDFUNCTION, 63373, L"Standard function", L"", L"" }, - { SCE_VHDL_STDPACKAGE, 63374, L"Standard package", L"", L"" }, - { SCE_VHDL_STDTYPE, 63375, L"Standard type", L"fore:#FF8000", L"" }, + { SCE_VHDL_STDFUNCTION, 63373, L"Standard Function", L"", L"" }, + { SCE_VHDL_STDPACKAGE, 63374, L"Standard Package", L"", L"" }, + { SCE_VHDL_STDTYPE, 63375, L"Standard Type", L"fore:#FF8000", L"" }, { -1, 00000, L"", L"", L"" } } }; @@ -2810,10 +2810,10 @@ EDITLEXER lexNimrod = { SCLEX_NIMROD, 63044, L"Nim Source Code", L"nim; nimrod", { MULTI_STYLE(SCE_P_COMMENTLINE,SCE_P_COMMENTBLOCK,SCE_C_COMMENTLINEDOC,0), 63127, L"Comment", L"fore:#880000", L"" }, { SCE_P_WORD, 63128, L"Keyword", L" bold; fore:#000088", L"" }, { SCE_P_IDENTIFIER, 63129, L"Identifier", L"", L"" }, - { MULTI_STYLE(SCE_P_STRING,SCE_P_STRINGEOL,0,0), 63211, L"String double quoted", L"fore:#008800", L"" }, - { SCE_P_CHARACTER, 63212, L"String single quoted", L"fore:#008800", L"" }, - { SCE_P_TRIPLEDOUBLE, 63244, L"String triple double quotes", L"fore:#008800", L"" }, - { SCE_P_TRIPLE, 63245, L"String triple single quotes", L"fore:#008800", L"" }, + { MULTI_STYLE(SCE_P_STRING,SCE_P_STRINGEOL,0,0), 63211, L"String Double Quoted", L"fore:#008800", L"" }, + { SCE_P_CHARACTER, 63212, L"String Single Quoted", L"fore:#008800", L"" }, + { SCE_P_TRIPLEDOUBLE, 63244, L"String Triple Double Quotes", L"fore:#008800", L"" }, + { SCE_P_TRIPLE, 63245, L"String Triple Single Quotes", L"fore:#008800", L"" }, { SCE_P_NUMBER, 63130, L"Number", L"fore:#FF4000", L"" }, { SCE_P_OPERATOR, 63132, L"Operator", L"bold; fore:#666600", L"" }, //{ SCE_P_DEFNAME, 63247, L"Function name", L"fore:#660066", L"" },