Skip to content

Commit

Permalink
Change style name to singular form.
Browse files Browse the repository at this point in the history
  • Loading branch information
@zufuliu
zufuliu committed Nov 29, 2018
1 parent 5cde90d commit 62e0808
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 29 deletions.
31 changes: 16 additions & 15 deletions src/EditLexers/number.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,39 +37,41 @@ style number must < 32 or > 40
63563, L"Predefined Variable"
63564, L"Here-doc"
63565, L"Now-doc"
63566, L"PHP TAG"
63566, L"PHP Tag"
63030 VBScript no
63031 Perl Script 63401-63440 yes
63032 Python Script 63461-63470 yes
63461, L"Short String"
63462, L"Long String"
63463, L"Short Bytes"
63464, L"Long Bytes"
63461, L"Bytes"
63462, L"Raw Bytes"
63463, L"Triple Quoted Bytes"
63464,
63465, L"Decorator"
63466, L"Build-in Functions"
63466, L"Build-in Function"
63467, L"object Method"
63468, L"Build-in Constants"
63468, L"Build-in Constant"
63469, L"Formatted String"
63470, L"Triple Quoted Formatted String"
63033 Ruby Script 63471-63480 yes
63471, L"Module"
63472, L"POD"
63473, L"Symbol"
63473,
63475, L"Data Section"
63034 Lua Script 63451-63460 yes
63452, L"String, Table & Math Functions"
63453, L"Input, Output & System Facilities"
63452, L"String, Table & Math Function"
63453, L"Input, Output & System Facility"
63035 TCL Script 63441-63450 yes
63441, L"Substitution"
63442, L"Modifier"
63036 Batch File no
63037 Shell Script 63531-63540 yes
63532, L"String double quoted"
63533, L"String single quoted"
63532, L"Double Quoted String"
63533, L"Single Quoted String"
63534, L"Scalar"
63535, L"Parameter expansion"
63535, L"Parameter Expansion"
63536,
63537, L"Here-doc (Delimiter)"
63538, L"Here-doc (Single quoted, q)"
63538, L"Here-doc (Single Quoted, q)"
63038 PowerShell Script 63481-63490 yes
63481, L"Cmdlet"
63482, L"Alias"
Expand All @@ -88,15 +90,14 @@ style number must < 32 or > 40
63577, L"Verbatim Segment"
63578, L"List Code"
63579, L"Chapter"
63580,
63043 VHDL Source 63581-63590 no
63581, L"STD Package"
63582, L"STD Operator"
63583, L"STD Function"
63584, L"STD Type"
63585, L"User Define"
63044 Verilog HDL Source yes
63586, L"System Tasks and Functions"
63586, L"System Task and Function"
63045 Makefiles no
63046 CMake Script 63361-63370 no
63047 Inno Setup Script 63501-63510 no
Expand Down
22 changes: 11 additions & 11 deletions src/EditLexers/stlDefault.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
EDITLEXER lexDefault = { SCLEX_NULL, NP2LEX_DEFAULT, EDITLEXER_HOLE(L"Default Text"), L"txt; text; wtx; log; asc; doc", &Keywords_NULL,
{
{ STYLE_DEFAULT, 63100, EDITSTYLE_HOLE(L"Default Style"), L"font:Default; size:11" },
{ STYLE_LINENUMBER, 63101, EDITSTYLE_HOLE(L"Margins and Line Numbers"), L"size:-2; fore:#2B91AF" },
{ STYLE_BRACELIGHT, 63102, EDITSTYLE_HOLE(L"Matching Braces"), L"size:+1; bold; fore:#FF0000" },
{ STYLE_BRACEBAD, 63103, EDITSTYLE_HOLE(L"Matching Braces Error"), L"size:+1; bold; fore:#000080" },
{ STYLE_CONTROLCHAR, 63104, EDITSTYLE_HOLE(L"Control Characters"), L"size:-1" },
{ STYLE_LINENUMBER, 63101, EDITSTYLE_HOLE(L"Margin and Line Number"), L"size:-2; fore:#2B91AF" },
{ STYLE_BRACELIGHT, 63102, EDITSTYLE_HOLE(L"Matching Brace"), L"size:+1; bold; fore:#FF0000" },
{ STYLE_BRACEBAD, 63103, EDITSTYLE_HOLE(L"Matching Brace Error"), L"size:+1; bold; fore:#000080" },
{ STYLE_CONTROLCHAR, 63104, EDITSTYLE_HOLE(L"Control Character"), L"size:-1" },
{ STYLE_INDENTGUIDE, 63105, EDITSTYLE_HOLE(L"Indentation Guide"), L"fore:#FF8000" },
{ SCI_SETSELFORE + SCI_SETSELBACK, 63106, EDITSTYLE_HOLE(L"Selected Text"), L"back:#0A246A; eolfilled; alpha:95" },
{ SCI_SETWHITESPACEFORE + SCI_SETWHITESPACEBACK + SCI_SETWHITESPACESIZE, 63107, EDITSTYLE_HOLE(L"Whitespace"), L"size:1; fore:#FF4000" },
Expand All @@ -25,10 +25,10 @@ EDITLEXER lexDefault = { SCLEX_NULL, NP2LEX_DEFAULT, EDITLEXER_HOLE(L"Default Te
{ 0, 63124, EDITSTYLE_HOLE(L"Folding Marker"), L"fore:#8080FF; back:#ADD8E6" },

{ STYLE_DEFAULT, 63112, EDITSTYLE_HOLE(L"2nd Default Style"), L"font:Default; size:11" },
{ STYLE_LINENUMBER, 63113, EDITSTYLE_HOLE(L"2nd Margins and Line Numbers"), L"font:Tahoma; size:-2; fore:#2B91AF" },
{ STYLE_BRACELIGHT, 63114, EDITSTYLE_HOLE(L"2nd Matching Braces"), L"bold; fore:#FF0000" },
{ STYLE_BRACEBAD, 63115, EDITSTYLE_HOLE(L"2nd Matching Braces Error"), L"bold; fore:#000080" },
{ STYLE_CONTROLCHAR, 63116, EDITSTYLE_HOLE(L"2nd Control Characters"), L"size:-1" },
{ STYLE_LINENUMBER, 63113, EDITSTYLE_HOLE(L"2nd Margin and Line Number"), L"font:Tahoma; size:-2; fore:#2B91AF" },
{ STYLE_BRACELIGHT, 63114, EDITSTYLE_HOLE(L"2nd Matching Brace"), L"bold; fore:#FF0000" },
{ STYLE_BRACEBAD, 63115, EDITSTYLE_HOLE(L"2nd Matching Brace Error"), L"bold; fore:#000080" },
{ STYLE_CONTROLCHAR, 63116, EDITSTYLE_HOLE(L"2nd Control Character"), L"size:-1" },
{ STYLE_INDENTGUIDE, 63117, EDITSTYLE_HOLE(L"2nd Indentation Guide"), L"fore:#FF8000" },
{ SCI_SETSELFORE + SCI_SETSELBACK, 63118, EDITSTYLE_HOLE(L"2nd Selected Text"), L"eolfilled" },
{ SCI_SETWHITESPACEFORE + SCI_SETWHITESPACEBACK + SCI_SETWHITESPACESIZE, 63119, EDITSTYLE_HOLE(L"2nd Whitespace"), L"size:1; fore:#FF4000" },
Expand All @@ -44,9 +44,9 @@ EDITLEXER lexDefault = { SCLEX_NULL, NP2LEX_DEFAULT, EDITLEXER_HOLE(L"Default Te
EDITLEXER lexANSI = { SCLEX_NULL, NP2LEX_ANSI, EDITLEXER_HOLE(L"ANSI Art"), L"nfo; diz", &Keywords_NULL,
{
{ STYLE_DEFAULT, NP2STYLE_Default, EDITSTYLE_HOLE(L"Default"), L"font:Lucida Console" },
{ STYLE_LINENUMBER, 63101, EDITSTYLE_HOLE(L"Margins and Line Numbers"), L"font:Lucida Console; size:-2" },
{ STYLE_BRACELIGHT, 63102, EDITSTYLE_HOLE(L"Matching Braces"), L"size:+0" },
{ STYLE_BRACEBAD, 63103, EDITSTYLE_HOLE(L"Matching Braces Error"), L"size:+0" },
{ STYLE_LINENUMBER, 63101, EDITSTYLE_HOLE(L"Margin and Line Number"), L"font:Lucida Console; size:-2" },
{ STYLE_BRACELIGHT, 63102, EDITSTYLE_HOLE(L"Matching Brace"), L"size:+0" },
{ STYLE_BRACEBAD, 63103, EDITSTYLE_HOLE(L"Matching Brace Error"), L"size:+0" },
EDITSTYLE_SENTINEL
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/EditLexers/stlGradle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ EDITLEXER lexGradle = { SCLEX_CPP, NP2LEX_GRADLE, EDITLEXER_HOLE(L"Gradle Build
{ SCE_C_INTERFACE, NP2STYLE_Interface, EDITSTYLE_HOLE(L"Interface"), L"bold; fore:#1E90FF" },
{ SCE_C_FUNCTION, NP2STYLE_Method, EDITSTYLE_HOLE(L"Method"), L"fore:#A46000" },
{ SCE_C_ENUMERATION, NP2STYLE_Enumeration, EDITSTYLE_HOLE(L"Action"), L"fore:#FF8000" },
{ SCE_C_CONSTANT, NP2STYLE_Constant, EDITSTYLE_HOLE(L"Properties"), L"fore:#B000B0" },
{ SCE_C_CONSTANT, NP2STYLE_Constant, EDITSTYLE_HOLE(L"Property"), L"fore:#B000B0" },
{ MULTI_STYLE(SCE_C_COMMENT, SCE_C_COMMENTLINE, 0, 0), NP2STYLE_Comment, EDITSTYLE_HOLE(L"Comment"), L"fore:#008000" },
{ SCE_C_COMMENTDOC_TAG, NP2STYLE_DocCommentTag, EDITSTYLE_HOLE(L"Doc Comment Tag"), L"bold; fore:#008000F" },
{ SCE_C_COMMENTDOC_TAG_XML, NP2STYLE_DocCommentTagHTML, EDITSTYLE_HOLE(L"Doc Comment HTML Tag"), L"bold; fore:#008000F" },
Expand Down
4 changes: 2 additions & 2 deletions src/EditLexers/stlHTML.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ EDITLEXER lexHTML = { SCLEX_HTML, NP2LEX_HTML, EDITLEXER_HOLE(L"Web Source Code"
{ MULTI_STYLE(SCE_HJ_DOUBLESTRING, SCE_HJ_SINGLESTRING, SCE_HJ_STRINGEOL, 0), 63205, EDITSTYLE_HOLE(L"JS String"), L"fore:#008000" },
{ SCE_HJ_REGEX, 63206, EDITSTYLE_HOLE(L"JS Regex"), L"fore:#006633; back:#FFF1A8" },
{ SCE_HJ_NUMBER, 63207, EDITSTYLE_HOLE(L"JS Number"), L"fore:#FF0000" },
{ SCE_HJ_SYMBOLS, 63208, EDITSTYLE_HOLE(L"JS Symbols"), L"fore:#B000B0" },
{ SCE_HJ_SYMBOLS, 63208, EDITSTYLE_HOLE(L"JS Symbol"), L"fore:#B000B0" },
/////////////////////////////////// ASP Javascript
{ MULTI_STYLE(SCE_HJA_DEFAULT, SCE_HJA_START, 0, 0), 63211, EDITSTYLE_HOLE(L"ASP JS Default"), L"" },
{ MULTI_STYLE(SCE_HJA_COMMENT, SCE_HJA_COMMENTLINE, SCE_HJA_COMMENTDOC, 0), 63212, EDITSTYLE_HOLE(L"ASP JS Comment"), L"fore:#608060" },
Expand All @@ -177,7 +177,7 @@ EDITLEXER lexHTML = { SCLEX_HTML, NP2LEX_HTML, EDITLEXER_HOLE(L"Web Source Code"
{ MULTI_STYLE(SCE_HJA_DOUBLESTRING, SCE_HJA_SINGLESTRING, SCE_HJA_STRINGEOL, 0), 63215, EDITSTYLE_HOLE(L"ASP JS String"), L"fore:#008000" },
{ SCE_HJA_REGEX, 63216, EDITSTYLE_HOLE(L"ASP JS Regex"), L"fore:#006633; back:#FFF1A8" },
{ SCE_HJA_NUMBER, 63217, EDITSTYLE_HOLE(L"ASP JS Number"), L"fore:#FF0000" },
{ SCE_HJA_SYMBOLS, 63218, EDITSTYLE_HOLE(L"ASP JS Symbols"), L"fore:#B000B0" },
{ SCE_HJA_SYMBOLS, 63218, EDITSTYLE_HOLE(L"ASP JS Symbol"), L"fore:#B000B0" },
////////////////////////////////////// VBS
{ MULTI_STYLE(SCE_HB_DEFAULT, SCE_HB_START, 0, 0), 63221, EDITSTYLE_HOLE(L"VBS Default"), L"" },
{ SCE_HB_COMMENTLINE, 63222, EDITSTYLE_HOLE(L"VBS Comment"), L"fore:#608060" },
Expand Down

0 comments on commit 62e0808

Please sign in to comment.