diff --git a/src/lexilla/.gitattributes b/src/lexilla/.gitattributes
index 0e7df5010..c20856ae3 100644
--- a/src/lexilla/.gitattributes
+++ b/src/lexilla/.gitattributes
@@ -29,10 +29,13 @@
 **.aspx text
 **.php text
 **.vb text
+**.asm text
+**.cob text
 **.cmake text
 **.d text
 **.diff text
 **.erl text
+**.f text
 **.gd text
 **.gui text
 **.iss text
diff --git a/src/lexilla/.gitignore b/src/lexilla/.gitignore
index 438c50c2b..725ec83cc 100644
--- a/src/lexilla/.gitignore
+++ b/src/lexilla/.gitignore
@@ -1,6 +1,5 @@
 *.o
 *.a
-*.asm
 *.lib
 *.obj
 *.iobj
diff --git a/src/lexilla/cppcheck.suppress b/src/lexilla/cppcheck.suppress
index d12fbdf89..1e96cda75 100644
--- a/src/lexilla/cppcheck.suppress
+++ b/src/lexilla/cppcheck.suppress
@@ -21,12 +21,13 @@ passedByValue
 // cppcheck 2.11 can't find system headers on Win32.
 missingIncludeSystem
 
+// Passing temporary string into hidden object creator functions: they do not hold the argument
+danglingTemporaryLifetime:lexilla/access/LexillaAccess.cxx
+returnDanglingLifetime:lexilla/access/LexillaAccess.cxx
+
 // cppcheck seems to believe that unique_ptr<char *[]>::get returns void* instead of char**
 arithOperationsOnVoidPointer:lexilla/lexlib/WordList.cxx
 
-// This could be fixed but it should be rewritten to use string_view which doesn't have resize
-uselessCallsSubstr:lexilla/lexers/LexCPP.cxx
-
 // cppcheck 2.11 limits checking of complex functions unless --check-level=exhaustive but that
 // only finds one false issue in LexRuby
 checkLevelNormal:lexilla/lexers/LexBash.cxx
@@ -41,6 +42,7 @@ constVariablePointer:lexilla/examples/CheckLexilla/CheckLexilla.c
 // Suppress most lexer warnings since the lexers are maintained by others
 redundantCondition:lexilla/lexers/LexA68k.cxx
 constParameterReference:lexilla/lexers/LexAbaqus.cxx
+constParameterReference:lexilla/lexers/LexAda.cxx
 constParameterReference:lexilla/lexers/LexAsciidoc.cxx
 constParameterCallback:lexilla/lexers/LexAsn1.cxx
 knownConditionTrueFalse:lexilla/lexers/LexAU3.cxx
@@ -53,16 +55,20 @@ constParameterReference:lexilla/lexers/LexBash.cxx
 knownConditionTrueFalse:lexilla/lexers/LexBash.cxx
 variableScope:lexilla/lexers/LexBash.cxx
 constVariable:lexilla/lexers/LexBasic.cxx
-variableScope:lexilla/lexers/LexCmake.cxx
-knownConditionTrueFalse:lexilla/lexers/LexCmake.cxx
 constParameterReference:lexilla/lexers/LexCLW.cxx
 knownConditionTrueFalse:lexilla/lexers/LexCLW.cxx
+variableScope:lexilla/lexers/LexCmake.cxx
+knownConditionTrueFalse:lexilla/lexers/LexCmake.cxx
+constParameterReference:lexilla/lexers/LexCmake.cxx
+constParameterReference:lexilla/lexers/LexCOBOL.cxx
 constParameterReference:lexilla/lexers/LexCoffeeScript.cxx
 constParameterPointer:lexilla/lexers/LexCoffeeScript.cxx
 knownConditionTrueFalse:lexilla/lexers/LexCoffeeScript.cxx
+constVariableReference:lexilla/lexers/LexConf.cxx
 constParameterReference:lexilla/lexers/LexCPP.cxx
 variableScope:lexilla/lexers/LexCSS.cxx
 knownConditionTrueFalse:lexilla/lexers/LexDataflex.cxx
+constParameterReference:lexilla/lexers/LexDataflex.cxx
 variableScope:lexilla/lexers/LexDataflex.cxx
 knownConditionTrueFalse:lexilla/lexers/LexECL.cxx
 variableScope:lexilla/lexers/LexECL.cxx
@@ -75,14 +81,16 @@ constParameter:lexilla/lexers/LexFortran.cxx
 constParameterReference:lexilla/lexers/LexFortran.cxx
 redundantContinue:lexilla/lexers/LexFortran.cxx
 knownConditionTrueFalse:lexilla/lexers/LexFSharp.cxx
+constParameterReference:lexilla/lexers/LexGAP.cxx
 constParameterReference:lexilla/lexers/LexGDScript.cxx
 variableScope:lexilla/lexers/LexGui4Cli.cxx
 constParameterReference:lexilla/lexers/LexHaskell.cxx
 constParameterReference:lexilla/lexers/LexHex.cxx
 knownConditionTrueFalse:lexilla/lexers/LexHex.cxx
-constParameterReference:lexilla/lexers/LexHTML.cxx
 constVariable:lexilla/lexers/LexHollywood.cxx
 variableScope:lexilla/lexers/LexInno.cxx
+constVariableReference:lexilla/lexers/LexInno.cxx
+constParameterReference:lexilla/lexers/LexJSON.cxx
 constParameterPointer:lexilla/lexers/LexJulia.cxx
 constParameterReference:lexilla/lexers/LexJulia.cxx
 knownConditionTrueFalse:lexilla/lexers/LexJulia.cxx
@@ -108,18 +116,24 @@ constParameterReference:lexilla/lexers/LexNimrod.cxx
 knownConditionTrueFalse:lexilla/lexers/LexNimrod.cxx
 variableScope:lexilla/lexers/LexNimrod.cxx
 variableScope:lexilla/lexers/LexNsis.cxx
+constParameterReference:lexilla/lexers/LexNsis.cxx
 knownConditionTrueFalse:lexilla/lexers/LexNsis.cxx
 variableScope:lexilla/lexers/LexOpal.cxx
+constParameterReference:lexilla/lexers/LexOpal.cxx
 knownConditionTrueFalse:lexilla/lexers/LexOpal.cxx
 constParameterReference:lexilla/lexers/LexOScript.cxx
+constParameterReference:lexilla/lexers/LexPascal.cxx
 variableScope:lexilla/lexers/LexPB.cxx
 constParameterReference:lexilla/lexers/LexPerl.cxx
+constVariableReference:lexilla/lexers/LexPerl.cxx
 knownConditionTrueFalse:lexilla/lexers/LexPerl.cxx
+constParameterReference:lexilla/lexers/LexPLM.cxx
 constParameterReference:lexilla/lexers/LexPO.cxx
 constParameterReference:lexilla/lexers/LexPython.cxx
 shadowVariable:lexilla/lexers/LexPowerPro.cxx
 knownConditionTrueFalse:lexilla/lexers/LexPowerPro.cxx
 variableScope:lexilla/lexers/LexProgress.cxx
+constParameterReference:lexilla/lexers/LexProgress.cxx
 constParameterReference:lexilla/lexers/LexRaku.cxx
 variableScope:lexilla/lexers/LexRaku.cxx
 redundantInitialization:lexilla/lexers/LexRegistry.cxx
@@ -128,10 +142,14 @@ constParameterReference:lexilla/lexers/LexRust.cxx
 knownConditionTrueFalse:lexilla/lexers/LexScriptol.cxx
 variableScope:lexilla/lexers/LexSpecman.cxx
 unreadVariable:lexilla/lexers/LexSpice.cxx
+constParameterReference:lexilla/lexers/LexSpice.cxx
 constParameterReference:lexilla/lexers/LexSTTXT.cxx
+constParameterReference:lexilla/lexers/LexTACL.cxx
 knownConditionTrueFalse:lexilla/lexers/LexTACL.cxx
 clarifyCalculation:lexilla/lexers/LexTADS3.cxx
 constParameterReference:lexilla/lexers/LexTADS3.cxx
+constParameterReference:lexilla/lexers/LexTAL.cxx
+constVariableReference:lexilla/lexers/LexTCL.cxx
 invalidscanf:lexilla/lexers/LexTCMD.cxx
 constParameterReference:lexilla/lexers/LexTeX.cxx
 variableScope:lexilla/lexers/LexTeX.cxx
@@ -149,6 +167,7 @@ variableScope:lexilla/lexers/LexVHDL.cxx
 unreadVariable:lexilla/lexers/LexVisualProlog.cxx
 variableScope:lexilla/lexers/LexVisualProlog.cxx
 shiftTooManyBitsSigned:lexilla/lexers/LexVisualProlog.cxx
+iterateByValue:lexilla/lexers/LexVisualProlog.cxx
 unreadVariable:lexilla/lexers/LexX12.cxx
 constVariableReference:lexilla/lexers/LexX12.cxx
 constParameterPointer:lexilla/lexers/LexX12.cxx
@@ -165,6 +184,7 @@ constParameterCallback:lexilla/lexers/LexPython.cxx
 constParameterCallback:lexilla/lexers/LexScriptol.cxx
 constParameterCallback:lexilla/lexers/LexVB.cxx
 
+constVariableReference:lexilla/lexers/LexBibTeX.cxx
 constVariableReference:lexilla/lexers/LexCSS.cxx
 constVariableReference:lexilla/lexers/LexCrontab.cxx
 constVariableReference:lexilla/lexers/LexGui4Cli.cxx
diff --git a/src/lexilla/doc/Lexilla.html b/src/lexilla/doc/Lexilla.html
index 1ae9bf270..cb549e763 100644
--- a/src/lexilla/doc/Lexilla.html
+++ b/src/lexilla/doc/Lexilla.html
@@ -9,7 +9,7 @@
     <meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
     <meta name="Description"
     content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
-    <meta name="Date.Modified" content="20231227" />
+    <meta name="Date.Modified" content="20240423" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         .logo {
@@ -61,8 +61,8 @@
           <font color="#FFCC99" size="4"> A library of language lexers for use with Scintilla</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3">Release version 5.3.0<br />
-           Site last modified December 27 2023</font>
+          <font color="#FFCC99" size="3">Release version 5.3.2<br />
+           Site last modified April 23 2024</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -77,11 +77,11 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.3.2 improves COBOL, HTML, Lua, Ruby, and Rust.</li>
+      <li>Version 5.3.1 improves Assembler, Bash, Batch, JavaScript, Python, and Ruby.</li>
       <li>Version 5.3.0 improves Bash, HTML, and Lua.</li>
       <li>Version 5.2.9 fixes potential problems on macOS 12 and older when built with Xcode 15.0.</li>
       <li>Version 5.2.8 improves Python and R.</li>
-      <li>Version 5.2.7 improves Bash, F#, and HTML.</li>
-      <li>Version 5.2.6 improves Bash, Errorlist, HTML, Matlab, and Visual Prolog.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/src/lexilla/doc/LexillaDownload.html b/src/lexilla/doc/LexillaDownload.html
index a6f86cb02..94106238f 100644
--- a/src/lexilla/doc/LexillaDownload.html
+++ b/src/lexilla/doc/LexillaDownload.html
@@ -26,9 +26,9 @@
     <table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
       <tr>
         <td>
-          <font size="4"> <a href="https://www.scintilla.org/lexilla530.zip">
+          <font size="4"> <a href="https://www.scintilla.org/lexilla532.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/lexilla530.tgz">
+	<a href="https://www.scintilla.org/lexilla532.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@ <h2>
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.3.0
+       Release 5.3.2
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@ <h4>
        The source code package contains all of the source code for Lexilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/lexilla530.zip">zip format</a> (1.3M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/lexilla530.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/lexilla532.zip">zip format</a> (1.3M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/lexilla532.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
        </ul>
        Instructions for building on both Windows and Linux are included in the readme file.
     <h4>
diff --git a/src/lexilla/doc/LexillaHistory.html b/src/lexilla/doc/LexillaHistory.html
index cfbc8097e..300b5fe4b 100644
--- a/src/lexilla/doc/LexillaHistory.html
+++ b/src/lexilla/doc/LexillaHistory.html
@@ -584,9 +584,94 @@ <h2>Contributors</h2>
 	<td>German Aizek</td>
 	<td>Tsuyoshi Miyake</td>
 	<td>Martin Schäfer</td>
+	<td>RainRat</td>
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla532.zip">Release 5.3.2</a>
+    </h3>
+    <ul>
+	<li>
+	Released 23 April 2024.
+	</li>
+	<li>
+	COBOL: Stop string literal continuing over line end.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/229">Issue #229</a>.
+	</li>
+	<li>
+	COBOL: Stop doc comment assigning different styles to \r and \n at line end.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/229">Issue #229</a>.
+	</li>
+	<li>
+	COBOL: Recognize keywords that start with 'V'.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/230">Issue #230</a>.
+	</li>
+	<li>
+	COBOL: Recognize comments after tag or that start with '/'.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/231">Issue #231</a>.
+	</li>
+	<li>
+	HTML: Implement substyles for tags, attributes, and identifiers
+	SCE_H_TAG, SCE_H_ATTRIBUTE, SCE_HJ_WORD, SCE_HJA_WORD, SCE_HB_WORD, SCE_HP_WORD, SCE_HPHP_WORD.
+	</li>
+	<li>
+	HTML: Implement context-sensitive attributes. "tag.attribute" matches "attribute" only inside "tag".
+	</li>
+	<li>
+	HTML: Match standard handling of comments.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/232">Issue #232</a>.
+	</li>
+	<li>
+	Lua: Implement substyles for identifiers SCE_LUA_IDENTIFIER.
+	</li>
+	<li>
+	Ruby: Allow non-ASCII here-doc delimiters.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/234">Issue #234</a>.
+	</li>
+	<li>
+	Ruby: Allow modifier if, unless, while and until after heredoc delimiter.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/236">Issue #236</a>.
+	</li>
+	<li>
+	Rust: Recognize raw identifiers.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/239">Issue #239</a>,
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/240">Pull request #240</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla531.zip">Release 5.3.1</a>
+    </h3>
+    <ul>
+	<li>
+	Released 5 March 2024.
+	</li>
+	<li>
+	Assembler: After comments, treat \r\n line ends the same as \n. This makes testing easier.
+	</li>
+	<li>
+	Bash: Fix folding when line changed to/from comment and previous line is comment.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/224">Issue #224</a>.
+	</li>
+	<li>
+	Batch: Fix handling ':' next to keywords.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/222">Issue #222</a>.
+	</li>
+	<li>
+	JavaScript: in cpp lexer, add lexer.cpp.backquoted.strings=2 mode to treat ` back-quoted
+	strings as template literals which allow embedded ${expressions}.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/94">Issue #94</a>.
+	</li>
+	<li>
+	Python: fix lexing of rb'' and rf'' strings.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/223">Issue #223</a>,
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/227">Pull request #227</a>.
+	</li>
+	<li>
+	Ruby: fix lexing of methods on numeric literals like '3.times' so the '.' and method name do not appear in numeric style.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/225">Issue #225</a>.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/lexilla530.zip">Release 5.3.0</a>
     </h3>
@@ -1964,7 +2049,7 @@ <h3>
 	</li>
 	<li>
 	Add SCI_SETTABMINIMUMWIDTH to set the minimum width of tabs.
-	This allows minimaps or overviews to be layed out to match the full size editing view.
+	This allows minimaps or overviews to be laid out to match the full size editing view.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2118/">Bug #2118</a>.
 	</li>
 	<li>
@@ -2533,7 +2618,7 @@ <h3>
 	<a href="https://sourceforge.net/p/scintilla/feature-requests/1210/">Feature #1210.</a>
 	</li>
 	<li>
-	Fix hang in Lua lexer when lexing a label upto the terminating "::".
+	Fix hang in Lua lexer when lexing a label up to the terminating "::".
 	<a href="https://sourceforge.net/p/scintilla/bugs/1999/">Bug #1999</a>.
 	</li>
 	<li>
@@ -2760,7 +2845,7 @@ <h3>
 	'Ctrl+L|SCI_LINEDELETE|'.
 	</li>
 	<li>
-	The Matlab lexer treats 'end' as a number rather than a keyword when used as a index.
+	The Matlab lexer treats 'end' as a number rather than a keyword when used as an index.
 	This also stops incorrect folding.
 	<a href="https://sourceforge.net/p/scintilla/bugs/1951/">Bug #1951</a>.
 	</li>
@@ -9803,7 +9888,7 @@ <h3>
 	SciTE crashing bug fixed in incremental search on Windows ME.
 	</li>
 	<li>
-	SciTE on Windows has a optional find and replace dialogs that can search through
+	SciTE on Windows has an optional find and replace dialogs that can search through
 	all buffers and search within a particular style number.
 	</li>
     </ul>
@@ -11372,7 +11457,7 @@ <h3>
 	SciTE's Export as LaTeX output improved.
       </li>
       <li>
-	Better choice of autocompletion displaying above the caret rather then
+	Better choice of autocompletion displaying above the caret rather than
 	below when that is more sensible.
       </li>
       <li>
@@ -12740,7 +12825,7 @@ <h3>
         Pascal lexer handles comments more correctly.
       </li>
       <li>
-        C/C++/Java/JavaScipt lexer has a state for line doc comments.
+        C/C++/Java/JavaScript lexer has a state for line doc comments.
       </li>
       <li>
         Error output lexer understands Sun CC messages.
@@ -13957,7 +14042,7 @@ <h3>
       <li>
         Scintilla supports a 'savepoint' in the undo stack which can be set by the container when
         the document is saved. Notifications are sent to the container when the savepoint is
-        entered or left, allowing the container to to display a dirty indicator and change its
+        entered or left, allowing the container to display a dirty indicator and change its
         menus.
       </li>
       <li>
diff --git a/src/lexilla/lexers/LexAsm.cxx b/src/lexilla/lexers/LexAsm.cxx
index 44f399a26..cd18126ef 100644
--- a/src/lexilla/lexers/LexAsm.cxx
+++ b/src/lexilla/lexers/LexAsm.cxx
@@ -240,10 +240,7 @@ Sci_Position SCI_METHOD LexerAsm::WordListSet(int n, const char *wl) {
 	}
 	Sci_Position firstModification = -1;
 	if (wordListN) {
-		WordList wlNew;
-		wlNew.Set(wl);
-		if (*wordListN != wlNew) {
-			wordListN->Set(wl);
+		if (wordListN->Set(wl)) {
 			firstModification = 0;
 		}
 	}
@@ -265,11 +262,19 @@ void SCI_METHOD LexerAsm::Lex(Sci_PositionU startPos, Sci_Position length, int i
 	for (; sc.More(); sc.Forward())
 	{
 
-		// Prevent SCE_ASM_STRINGEOL from leaking back to previous line
-		if (sc.atLineStart && (sc.state == SCE_ASM_STRING)) {
-			sc.SetState(SCE_ASM_STRING);
-		} else if (sc.atLineStart && (sc.state == SCE_ASM_CHARACTER)) {
-			sc.SetState(SCE_ASM_CHARACTER);
+		if (sc.atLineStart) {
+			switch (sc.state) {
+			case SCE_ASM_STRING:
+			case SCE_ASM_CHARACTER:
+				// Prevent SCE_ASM_STRINGEOL from leaking back to previous line
+				sc.SetState(sc.state);
+				break;
+			case SCE_ASM_COMMENT:
+				sc.SetState(SCE_ASM_DEFAULT);
+				break;
+			default:
+				break;
+			}
 		}
 
 		// Handle line continuation generically.
@@ -326,15 +331,11 @@ void SCI_METHOD LexerAsm::Lex(Sci_PositionU startPos, Sci_Position length, int i
 		} else if (sc.state == SCE_ASM_COMMENTDIRECTIVE) {
 			char delimiter = options.delimiter.empty() ? '~' : options.delimiter.c_str()[0];
 			if (sc.ch == delimiter) {
-				while (!sc.atLineEnd) {
+				while (!sc.MatchLineEnd()) {
 					sc.Forward();
 				}
 				sc.SetState(SCE_ASM_DEFAULT);
 			}
-		} else if (sc.state == SCE_ASM_COMMENT ) {
-			if (sc.atLineEnd) {
-				sc.SetState(SCE_ASM_DEFAULT);
-			}
 		} else if (sc.state == SCE_ASM_STRING) {
 			if (sc.ch == '\\') {
 				if (sc.chNext == '\"' || sc.chNext == '\'' || sc.chNext == '\\') {
diff --git a/src/lexilla/lexers/LexBash.cxx b/src/lexilla/lexers/LexBash.cxx
index 8bae51697..aac429505 100644
--- a/src/lexilla/lexers/LexBash.cxx
+++ b/src/lexilla/lexers/LexBash.cxx
@@ -16,6 +16,7 @@
 #include <string_view>
 #include <vector>
 #include <map>
+#include <initializer_list>
 #include <functional>
 
 #include "ILexer.h"
@@ -23,6 +24,7 @@
 #include "SciLexer.h"
 
 #include "StringCopy.h"
+#include "InList.h"
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "StyleContext.h"
@@ -63,7 +65,7 @@ enum class CmdState {
 	Delimiter,
 };
 
-enum class CommandSubstitution {
+enum class CommandSubstitution : int {
 	Backtick,
 	Inside,
 	InsideTrack,
@@ -181,7 +183,7 @@ struct OptionsBash {
 	bool stylingInsideParameter = false;
 	bool stylingInsideHeredoc = false;
 	bool nestedBackticks = true;
-	int commandSubstitution = static_cast<int>(CommandSubstitution::Backtick);
+	CommandSubstitution commandSubstitution = CommandSubstitution::Backtick;
 	std::string specialParameter = BASH_SPECIAL_PARAMETER;
 
 	[[nodiscard]] bool stylingInside(int state) const noexcept {
@@ -481,12 +483,11 @@ class LexerBash final : public DefaultLexer {
 	OptionSetBash osBash;
 	CharacterSet setParamStart;
 	enum { ssIdentifier, ssScalar };
-	SubStyles subStyles;
+	SubStyles subStyles{styleSubable};
 public:
 	LexerBash() :
 		DefaultLexer("bash", SCLEX_BASH, lexicalClasses, std::size(lexicalClasses)),
-		setParamStart(CharacterSet::setAlphaNum, "_" BASH_SPECIAL_PARAMETER),
-		subStyles(styleSubable, 0x80, 0x40, 0) {
+		setParamStart(CharacterSet::setAlphaNum, "_" BASH_SPECIAL_PARAMETER) {
 		cmdDelimiter.Set("| || |& & && ; ;; ( ) { }");
 		bashStruct.Set("if elif fi while until else then do done esac eval");
 		bashStruct_in.Set("for case select");
@@ -622,7 +623,7 @@ void SCI_METHOD LexerBash::Lex(Sci_PositionU startPos, Sci_Position length, int
 
 	QuoteStackCls QuoteStack(setParamStart);
 	QuoteStack.nestedBackticks = options.nestedBackticks;
-	QuoteStack.commandSubstitution = static_cast<CommandSubstitution>(options.commandSubstitution);
+	QuoteStack.commandSubstitution = options.commandSubstitution;
 
 	const WordClassifier &classifierIdentifiers = subStyles.Classifier(SCE_SH_IDENTIFIER);
 	const WordClassifier &classifierScalars = subStyles.Classifier(SCE_SH_SCALAR);
@@ -1187,10 +1188,17 @@ void SCI_METHOD LexerBash::Fold(Sci_PositionU startPos_, Sci_Position length, in
 
 	LexAccessor styler(pAccess);
 
-	const Sci_Position startPos = startPos_;
+	Sci_Position startPos = startPos_;
 	const Sci_Position endPos = startPos + length;
 	int visibleChars = 0;
 	Sci_Position lineCurrent = styler.GetLine(startPos);
+	// Backtrack to previous line in case need to fix its fold status
+	if (lineCurrent > 0) {
+		lineCurrent--;
+		startPos = styler.LineStart(lineCurrent);
+		initStyle = (startPos > 0) ? styler.StyleIndexAt(startPos - 1) : 0;
+	}
+
 	int levelPrev = styler.LevelAt(lineCurrent) & SC_FOLDLEVELNUMBERMASK;
 	int levelCurrent = levelPrev;
 	char chNext = styler[startPos];
@@ -1215,28 +1223,32 @@ void SCI_METHOD LexerBash::Fold(Sci_PositionU startPos_, Sci_Position length, in
 					 && !IsCommentLine(lineCurrent + 1, styler))
 				levelCurrent--;
 		}
-		if (style == SCE_SH_WORD) {
+
+		switch (style) {
+		case SCE_SH_WORD:
 			if ((wordlen + 1) < sizeof(word))
 				word[wordlen++] = ch;
 			if (styleNext != style) {
 				word[wordlen] = '\0';
 				wordlen = 0;
-				if (strcmp(word, "if") == 0 || strcmp(word, "case") == 0 || strcmp(word, "do") == 0) {
+				if (InList(word, {"if", "case", "do"})) {
 					levelCurrent++;
-				} else if (strcmp(word, "fi") == 0 || strcmp(word, "esac") == 0 || strcmp(word, "done") == 0) {
+				} else if (InList(word, {"fi", "esac", "done"})) {
 					levelCurrent--;
 				}
 			}
-		}
-		if (style == SCE_SH_OPERATOR) {
+			break;
+
+		case SCE_SH_OPERATOR:
 			if (ch == '{') {
 				levelCurrent++;
 			} else if (ch == '}') {
 				levelCurrent--;
 			}
-		}
+			break;
+
 		// Here Document folding
-		if (style == SCE_SH_HERE_DELIM) {
+		case SCE_SH_HERE_DELIM:
 			if (stylePrev == SCE_SH_HERE_Q) {
 				levelCurrent--;
 			} else if (stylePrev != SCE_SH_HERE_DELIM) {
@@ -1246,9 +1258,14 @@ void SCI_METHOD LexerBash::Fold(Sci_PositionU startPos_, Sci_Position length, in
 					}
 				}
 			}
-		} else if (style == SCE_SH_HERE_Q && styleNext == SCE_SH_DEFAULT) {
-			levelCurrent--;
+			break;
+		case SCE_SH_HERE_Q:
+			if (styleNext == SCE_SH_DEFAULT) {
+				levelCurrent--;
+			}
+			break;
 		}
+
 		if (atEOL) {
 			int lev = levelPrev;
 			if (visibleChars == 0 && options.foldCompact)
diff --git a/src/lexilla/lexers/LexBatch.cxx b/src/lexilla/lexers/LexBatch.cxx
index 225465cf0..aab1cb7f3 100644
--- a/src/lexilla/lexers/LexBatch.cxx
+++ b/src/lexilla/lexers/LexBatch.cxx
@@ -14,11 +14,13 @@
 
 #include <string>
 #include <string_view>
+#include <initializer_list>
 
 #include "ILexer.h"
 #include "Scintilla.h"
 #include "SciLexer.h"
 
+#include "InList.h"
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "Accessor.h"
@@ -57,7 +59,7 @@ constexpr bool IsBSeparator(char ch) noexcept {
 }
 
 // Tests for escape character
-bool IsEscaped(const char* wordStr, Sci_PositionU pos) noexcept {
+constexpr bool IsEscaped(const char* wordStr, Sci_PositionU pos) noexcept {
 	bool isQoted=false;
 	while (pos>0){
 		pos--;
@@ -69,30 +71,24 @@ bool IsEscaped(const char* wordStr, Sci_PositionU pos) noexcept {
 	return isQoted;
 }
 
-// Tests for quote character
-bool textQuoted(const char *lineBuffer, Sci_PositionU endPos) {
-	char strBuffer[1024];
-	strncpy(strBuffer, lineBuffer, endPos);
-	strBuffer[endPos] = '\0';
+constexpr bool IsQuotedBy(std::string_view svBuffer, char quote) noexcept {
 	bool CurrentStatus = false;
-	const char strQuotes[] = "\"'";
-	const size_t strLength = strlen(strQuotes);
-	for (size_t i = 0; i < strLength; i++) {
-		const char *pQuote = strchr(strBuffer, strQuotes[i]);
-		while (pQuote)
-		{
-			if (!IsEscaped(strBuffer, pQuote - strBuffer)) {
-				CurrentStatus = !CurrentStatus;
-			}
-			pQuote = strchr(pQuote + 1, strQuotes[i]);
-		}
-		if (CurrentStatus) {
-			break;
+	size_t pQuote = svBuffer.find(quote);
+	while (pQuote != std::string_view::npos) {
+		if (!IsEscaped(svBuffer.data(), pQuote)) {
+			CurrentStatus = !CurrentStatus;
 		}
+		pQuote = svBuffer.find(quote, pQuote + 1);
 	}
 	return CurrentStatus;
 }
 
+// Tests for quote character
+constexpr bool textQuoted(const char *lineBuffer, Sci_PositionU endPos) noexcept {
+	const std::string_view svBuffer(lineBuffer, endPos);
+	return IsQuotedBy(svBuffer, '\"') || IsQuotedBy(svBuffer, '\'');
+}
+
 void ColouriseBatchDoc(
     Sci_PositionU startPos,
     Sci_Position length,
@@ -200,18 +196,19 @@ void ColouriseBatchDoc(
 					styler.ColourTo(startLine + offset - 1, SCE_BAT_DEFAULT);
 				}
 				char wordBuffer[81]{};		// Word Buffer - large to catch long paths
-				// Copy word from Line Buffer into Word Buffer
+				// Copy word from Line Buffer into Word Buffer and convert to lower case
 				Sci_PositionU wbl = 0;		// Word Buffer Length
 				for (; offset < lengthLine && wbl < 80 &&
 						!isspacechar(lineBuffer[offset]); wbl++, offset++) {
-					wordBuffer[wbl] = tolower(lineBuffer[offset]);
+					wordBuffer[wbl] = MakeLowerCase(lineBuffer[offset]);
 				}
 				wordBuffer[wbl] = '\0';
+				const std::string_view wordView(wordBuffer);
 				Sci_PositionU wbo = 0;		// Word Buffer Offset - also Special Keyword Buffer Length
 
 				// Check for Comment - return if found
 				if (continueProcessing) {
-					if ((CompareCaseInsensitive(wordBuffer, "rem") == 0) || (wordBuffer[0] == ':' && wordBuffer[1] == ':')) {
+					if ((wordView == "rem") || (wordBuffer[0] == ':' && wordBuffer[1] == ':')) {
 						if ((offset == wbl) || !textQuoted(lineBuffer, offset - wbl)) {
 							styler.ColourTo(startLine + offset - wbl - 1, SCE_BAT_DEFAULT);
 							styler.ColourTo(endPos, SCE_BAT_COMMENT);
@@ -248,19 +245,16 @@ void ColouriseBatchDoc(
 				} else if ((keywords.InList(wordBuffer)) &&
 					(continueProcessing)) {
 					// ECHO, GOTO, PROMPT and SET require no further Regular Keyword Checking
-					if ((CompareCaseInsensitive(wordBuffer, "echo") == 0) ||
-						(CompareCaseInsensitive(wordBuffer, "goto") == 0) ||
-						(CompareCaseInsensitive(wordBuffer, "prompt") == 0)) {
+					if (InList(wordView, {"echo", "goto", "prompt"})) {
 						continueProcessing = false;
 					}
 					// SET requires additional processing for the assignment operator
-					if (CompareCaseInsensitive(wordBuffer, "set") == 0) {
+					if (wordView == "set") {
 						continueProcessing = false;
 						isNotAssigned=true;
 					}
 					// Identify External Command / Program Location for ERRORLEVEL, and EXIST
-					if ((CompareCaseInsensitive(wordBuffer, "errorlevel") == 0) ||
-						(CompareCaseInsensitive(wordBuffer, "exist") == 0)) {
+					if (InList(wordView, {"errorlevel", "exist"})) {
 						// Reset External Command / Program Location
 						cmdLoc = offset;
 						// Skip next spaces
@@ -279,10 +273,7 @@ void ColouriseBatchDoc(
 							cmdLoc++;
 						}
 					// Identify External Command / Program Location for CALL, DO, LOADHIGH and LH
-					} else if ((CompareCaseInsensitive(wordBuffer, "call") == 0) ||
-						(CompareCaseInsensitive(wordBuffer, "do") == 0) ||
-						(CompareCaseInsensitive(wordBuffer, "loadhigh") == 0) ||
-						(CompareCaseInsensitive(wordBuffer, "lh") == 0)) {
+					} else if (InList(wordView, {"call", "do", "loadhigh", "lh"})) {
 						// Reset External Command / Program Location
 						cmdLoc = offset;
 						// Skip next spaces
@@ -290,6 +281,11 @@ void ColouriseBatchDoc(
 							(isspacechar(lineBuffer[cmdLoc]))) {
 							cmdLoc++;
 						}
+						// Check if call is followed by a label
+						if ((lineBuffer[cmdLoc] == ':') &&
+							(wordView == "call")) {
+							continueProcessing = false;
+						}
 					}
 					// Colorize Regular keyword
 					styler.ColourTo(startLine + offset - 1, SCE_BAT_WORD);
@@ -317,10 +313,12 @@ void ColouriseBatchDoc(
 						// Check for Special Keyword in list
 						if ((keywords.InList(sKeywordBuffer)) &&
 							((IsBOperator(wordBuffer[wbo])) ||
-							(IsBSeparator(wordBuffer[wbo])))) {
+							(IsBSeparator(wordBuffer[wbo])) ||
+							(wordBuffer[wbo] == ':' &&
+							(InList(sKeywordBuffer, {"call", "echo", "goto"}) )))) {
 							sKeywordFound = true;
 							// ECHO requires no further Regular Keyword Checking
-							if (CompareCaseInsensitive(sKeywordBuffer, "echo") == 0) {
+							if (std::string_view(sKeywordBuffer) == "echo") {
 								continueProcessing = false;
 							}
 							// Colorize Special Keyword as Regular Keyword
@@ -347,11 +345,11 @@ void ColouriseBatchDoc(
 							// Reset Offset to re-process remainder of word
 							offset -= (wbl - wbo);
 							// CHOICE requires no further Regular Keyword Checking
-							if (CompareCaseInsensitive(wordBuffer, "choice") == 0) {
+							if (wordView == "choice") {
 								continueProcessing = false;
 							}
 							// Check for START (and its switches) - What follows is External Command \ Program
-							if (CompareCaseInsensitive(wordBuffer, "start") == 0) {
+							if (wordView == "start") {
 								// Reset External Command / Program Location
 								cmdLoc = offset;
 								// Skip next spaces
@@ -576,7 +574,7 @@ void ColouriseBatchDoc(
 							isNotAssigned=false;
 						}
 						// Colorize Other Operators
-						// Do not Colorize Paranthesis, quoted text and escaped operators
+						// Do not Colorize Parenthesis, quoted text and escaped operators
 						if (((wordBuffer[0] != ')') && (wordBuffer[0] != '(')
 						&& !textQuoted(lineBuffer, offset - wbl)  && !IsEscaped(lineBuffer,offset - wbl + wbo))
 						&& !((wordBuffer[0] == '=') && !isNotAssigned ))
diff --git a/src/lexilla/lexers/LexCOBOL.cxx b/src/lexilla/lexers/LexCOBOL.cxx
index 39682f55d..adf6eacad 100644
--- a/src/lexilla/lexers/LexCOBOL.cxx
+++ b/src/lexilla/lexers/LexCOBOL.cxx
@@ -55,15 +55,15 @@ inline bool isCOBOLwordstart(char ch)
     }
 
 static int CountBits(int nBits)
-	{
-	int count = 0;
-	for (int i = 0; i < 32; ++i)
-		{
-		count += nBits & 1;
-		nBits >>= 1;
-		}
-	return count;
-	}
+    {
+    int count = 0;
+    for (int i = 0; i < 32; ++i)
+        {
+        count += nBits & 1;
+        nBits >>= 1;
+        }
+    return count;
+    }
 
 static void getRange(Sci_PositionU start,
         Sci_PositionU end,
@@ -86,28 +86,28 @@ static void ColourTo(Accessor &styler, Sci_PositionU end, unsigned int attr) {
 static int classifyWordCOBOL(Sci_PositionU start, Sci_PositionU end, /*WordList &keywords*/WordList *keywordlists[], Accessor &styler, int nContainment, bool *bAarea) {
     int ret = 0;
 
-    WordList& a_keywords = *keywordlists[0];
-    WordList& b_keywords = *keywordlists[1];
-    WordList& c_keywords = *keywordlists[2];
-
     char s[100];
     s[0] = '\0';
     s[1] = '\0';
     getRange(start, end, styler, s, sizeof(s));
 
-    char chAttr = SCE_C_IDENTIFIER;
+    int chAttr = SCE_C_IDENTIFIER;
     if (isdigit(s[0]) || (s[0] == '.') || (s[0] == 'v')) {
         chAttr = SCE_C_NUMBER;
-		char *p = s + 1;
-		while (*p) {
-			if ((!isdigit(*p) && (*p) != 'v') && isCOBOLwordchar(*p)) {
-				chAttr = SCE_C_IDENTIFIER;
-			    break;
-			}
-			++p;
-		}
+        char *p = s + 1;
+        while (*p) {
+            if ((!isdigit(*p) && (*p) != 'v') && isCOBOLwordchar(*p)) {
+                chAttr = SCE_C_IDENTIFIER;
+                break;
+            }
+            ++p;
+        }
     }
-    else {
+    if (chAttr == SCE_C_IDENTIFIER) {
+        WordList& a_keywords = *keywordlists[0];
+        WordList& b_keywords = *keywordlists[1];
+        WordList& c_keywords = *keywordlists[2];
+
         if (a_keywords.InList(s)) {
             chAttr = SCE_C_WORD;
         }
@@ -121,22 +121,22 @@ static int classifyWordCOBOL(Sci_PositionU start, Sci_PositionU end, /*WordList
     if (*bAarea) {
         if (strcmp(s, "division") == 0) {
             ret = IN_DIVISION;
-			// we've determined the containment, anything else is just ignored for those purposes
-			*bAarea = false;
-		} else if (strcmp(s, "declaratives") == 0) {
+            // we've determined the containment, anything else is just ignored for those purposes
+            *bAarea = false;
+        } else if (strcmp(s, "declaratives") == 0) {
             ret = IN_DIVISION | IN_DECLARATIVES;
-			if (nContainment & IN_DECLARATIVES)
-				ret |= NOT_HEADER | IN_SECTION;
-			// we've determined the containment, anything else is just ignored for those purposes
-			*bAarea = false;
-		} else if (strcmp(s, "section") == 0) {
+            if (nContainment & IN_DECLARATIVES)
+                ret |= NOT_HEADER | IN_SECTION;
+            // we've determined the containment, anything else is just ignored for those purposes
+            *bAarea = false;
+        } else if (strcmp(s, "section") == 0) {
             ret = (nContainment &~ IN_PARAGRAPH) | IN_SECTION;
-			// we've determined the containment, anything else is just ignored for those purposes
-			*bAarea = false;
-		} else if (strcmp(s, "end") == 0 && (nContainment & IN_DECLARATIVES)) {
+            // we've determined the containment, anything else is just ignored for those purposes
+            *bAarea = false;
+        } else if (strcmp(s, "end") == 0 && (nContainment & IN_DECLARATIVES)) {
             ret = IN_DIVISION | IN_DECLARATIVES | IN_SECTION | NOT_HEADER;
-		} else {
-			ret = nContainment | IN_PARAGRAPH;
+        } else {
+            ret = nContainment | IN_PARAGRAPH;
         }
     }
     ColourTo(styler, end, chAttr);
@@ -161,7 +161,7 @@ static void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int i
     if (currentLine > 0) {
         styler.SetLineState(currentLine, styler.GetLineState(currentLine-1));
         nContainment = styler.GetLineState(currentLine);
-		nContainment &= ~NOT_HEADER;
+        nContainment &= ~NOT_HEADER;
     } else {
         styler.SetLineState(currentLine, 0);
         nContainment = 0;
@@ -170,20 +170,20 @@ static void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int i
     styler.StartSegment(startPos);
     bool bNewLine = true;
     bool bAarea = !isspacechar(chNext);
-	int column = 0;
+    int column = 0;
     for (Sci_PositionU i = startPos; i < lengthDoc; i++) {
         char ch = chNext;
 
         chNext = styler.SafeGetCharAt(i + 1);
 
-		++column;
+        ++column;
 
         if (bNewLine) {
-			column = 0;
+            column = 0;
+        }
+        if (column <= 1 && !bAarea) {
+            bAarea = !isspacechar(ch);
         }
-		if (column <= 1 && !bAarea) {
-			bAarea = !isspacechar(ch);
-			}
         bool bSetNewLine = false;
         if ((ch == '\r' && chNext != '\n') || (ch == '\n')) {
             // Trigger on CR only (Mac style) or either on LF from CR+LF (Dos/Win) or on LF alone (Unix)
@@ -196,8 +196,8 @@ static void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int i
             styler.SetLineState(currentLine, nContainment);
             currentLine++;
             bSetNewLine = true;
-			if (nContainment & NOT_HEADER)
-				nContainment &= ~(NOT_HEADER | IN_DECLARATIVES | IN_SECTION);
+            if (nContainment & NOT_HEADER)
+                nContainment &= ~(NOT_HEADER | IN_DECLARATIVES | IN_SECTION);
         }
 
         if (styler.IsLeadByte(ch)) {
@@ -211,7 +211,7 @@ static void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int i
             if (isCOBOLwordstart(ch) || (ch == '$' && IsASCII(chNext) && isalpha(chNext))) {
                 ColourTo(styler, i-1, state);
                 state = SCE_C_IDENTIFIER;
-            } else if (column == 6 && ch == '*') {
+            } else if (column == 6 && (ch == '*' || ch == '/')) {
             // Cobol comment line: asterisk in column 7.
                 ColourTo(styler, i-1, state);
                 state = SCE_C_COMMENTLINE;
@@ -255,7 +255,9 @@ static void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int i
 
                 state = SCE_C_DEFAULT;
                 chNext = styler.SafeGetCharAt(i + 1);
-                if (ch == '"') {
+                if (column == 6 && (ch == '*' || ch == '/')) {
+                    state = SCE_C_COMMENTLINE;
+                } else if (ch == '"') {
                     state = SCE_C_STRING;
                 } else if (ch == '\'') {
                     state = SCE_C_CHARACTER;
@@ -271,7 +273,7 @@ static void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int i
                 }
             } else if (state == SCE_C_COMMENT) {
                 if (ch == '\r' || ch == '\n') {
-                    ColourTo(styler, i, state);
+                    ColourTo(styler, i-1, state);
                     state = SCE_C_DEFAULT;
                 }
             } else if (state == SCE_C_COMMENTDOC) {
@@ -279,7 +281,7 @@ static void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int i
                     if (((i > styler.GetStartSegment() + 2) || (
                         (initStyle == SCE_C_COMMENTDOC) &&
                         (styler.GetStartSegment() == static_cast<Sci_PositionU>(startPos))))) {
-                            ColourTo(styler, i, state);
+                            ColourTo(styler, i-1, state);
                             state = SCE_C_DEFAULT;
                     }
                 }
@@ -292,6 +294,9 @@ static void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int i
                 if (ch == '"') {
                     ColourTo(styler, i, state);
                     state = SCE_C_DEFAULT;
+                } else if (ch == '\r' || ch == '\n') {
+                    ColourTo(styler, i-1, state);
+                    state = SCE_C_DEFAULT;
                 }
             } else if (state == SCE_C_CHARACTER) {
                 if (ch == '\'') {
@@ -302,10 +307,10 @@ static void ColouriseCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int i
         }
         chPrev = ch;
         bNewLine = bSetNewLine;
-		if (bNewLine)
-			{
-			bAarea = false;
-			}
+        if (bNewLine)
+            {
+            bAarea = false;
+            }
     }
     ColourTo(styler, lengthDoc - 1, state);
 }
@@ -321,26 +326,26 @@ static void FoldCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int, WordL
 
     bool bNewLine = true;
     bool bAarea = !isspacechar(chNext);
-	int column = 0;
-	bool bComment = false;
+    int column = 0;
+    bool bComment = false;
     for (Sci_PositionU i = startPos; i < endPos; i++) {
         char ch = chNext;
         chNext = styler.SafeGetCharAt(i + 1);
-		++column;
+        ++column;
 
         if (bNewLine) {
-			column = 0;
-			bComment = (ch == '*' || ch == '/' || ch == '?');
+            column = 0;
+            bComment = (ch == '*' || ch == '/' || ch == '?');
+        }
+        if (column <= 1 && !bAarea) {
+            bAarea = !isspacechar(ch);
         }
-		if (column <= 1 && !bAarea) {
-			bAarea = !isspacechar(ch);
-			}
         bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
         if (atEOL) {
-			int nContainment = styler.GetLineState(lineCurrent);
+            int nContainment = styler.GetLineState(lineCurrent);
             int lev = CountBits(nContainment & IN_FLAGS) | SC_FOLDLEVELBASE;
-			if (bAarea && !bComment)
-				--lev;
+            if (bAarea && !bComment)
+                --lev;
             if (visibleChars == 0 && foldCompact)
                 lev |= SC_FOLDLEVELWHITEFLAG;
             if ((bAarea) && (visibleChars > 0) && !(nContainment & NOT_HEADER) && !bComment)
@@ -348,14 +353,14 @@ static void FoldCOBOLDoc(Sci_PositionU startPos, Sci_Position length, int, WordL
             if (lev != styler.LevelAt(lineCurrent)) {
                 styler.SetLevel(lineCurrent, lev);
             }
-			if ((lev & SC_FOLDLEVELNUMBERMASK) <= (levelPrev & SC_FOLDLEVELNUMBERMASK)) {
-				// this level is at the same level or less than the previous line
-				// therefore these is nothing for the previous header to collapse, so remove the header
-				styler.SetLevel(lineCurrent - 1, levelPrev & ~SC_FOLDLEVELHEADERFLAG);
-			}
+            if ((lev & SC_FOLDLEVELNUMBERMASK) <= (levelPrev & SC_FOLDLEVELNUMBERMASK)) {
+                // this level is at the same level or less than the previous line
+                // therefore these is nothing for the previous header to collapse, so remove the header
+                styler.SetLevel(lineCurrent - 1, levelPrev & ~SC_FOLDLEVELHEADERFLAG);
+            }
             levelPrev = lev;
             visibleChars = 0;
-			bAarea = false;
+            bAarea = false;
             bNewLine = true;
             lineCurrent++;
         } else {
diff --git a/src/lexilla/lexers/LexCPP.cxx b/src/lexilla/lexers/LexCPP.cxx
index 00494cd28..0ea819428 100644
--- a/src/lexilla/lexers/LexCPP.cxx
+++ b/src/lexilla/lexers/LexCPP.cxx
@@ -87,17 +87,13 @@ bool followsReturnKeyword(const StyleContext &sc, LexAccessor &styler) {
 	return !*s;
 }
 
-constexpr bool IsSpaceOrTab(int ch) noexcept {
-	return ch == ' ' || ch == '\t';
-}
-
 constexpr bool IsOperatorOrSpace(int ch) noexcept {
 	return isoperator(ch) || IsASpace(ch);
 }
 
-bool OnlySpaceOrTab(const std::string &s) noexcept {
+bool OnlySpaceOrTab(std::string_view s) noexcept {
 	for (const char ch : s) {
-		if (!IsSpaceOrTab(ch))
+		if (!IsASpaceOrTab(ch))
 			return false;
 	}
 	return true;
@@ -141,7 +137,7 @@ BracketPair FindBracketPair(Tokens &tokens) {
 }
 
 void highlightTaskMarker(StyleContext &sc, LexAccessor &styler,
-		int activity, const WordList &markerList, bool caseSensitive){
+		int activity, const WordList &markerList, bool caseSensitive) {
 	if (IsOperatorOrSpace(sc.chPrev) && !IsOperatorOrSpace(sc.ch) && markerList.Length()) {
 		std::string marker;
 		for (Sci_PositionU currPos = sc.currentPos; true; currPos++) {
@@ -160,16 +156,19 @@ void highlightTaskMarker(StyleContext &sc, LexAccessor &styler,
 	}
 }
 
+const CharacterSet setHexDigits(CharacterSet::setDigits, "ABCDEFabcdef");
+const CharacterSet setOctDigits("01234567");
+const CharacterSet setNoneNumeric;
+
 class EscapeSequence {
-	const CharacterSet setHexDigits = CharacterSet(CharacterSet::setDigits, "ABCDEFabcdef");
-	const CharacterSet setOctDigits = CharacterSet("01234567");
-	const CharacterSet setNoneNumeric;
 	const CharacterSet *escapeSetValid = nullptr;
 	int digitsLeft = 0;
 public:
+	int outerState = SCE_C_DEFAULT;
 	EscapeSequence() = default;
-	void resetEscapeState(int nextChar) noexcept {
+	void resetEscapeState(int state, int nextChar) noexcept {
 		digitsLeft = 0;
+		outerState = state;
 		escapeSetValid = &setNoneNumeric;
 		if (nextChar == 'U') {
 			digitsLeft = 9;
@@ -185,7 +184,7 @@ class EscapeSequence {
 			escapeSetValid = &setOctDigits;
 		}
 	}
-	bool atEscapeEnd(int currChar) const noexcept {
+	[[nodiscard]] bool atEscapeEnd(int currChar) const noexcept {
 		return (digitsLeft <= 0) || !escapeSetValid->Contains(currChar);
 	}
 	void consumeDigit() noexcept {
@@ -233,7 +232,7 @@ struct PPDefinition {
 	std::string value;
 	bool isUndef;
 	std::string arguments;
-	PPDefinition(Sci_Position line_, const std::string &key_, const std::string &value_, bool isUndef_ = false, const std::string &arguments_="") :
+	PPDefinition(Sci_Position line_, std::string_view key_, std::string_view value_, bool isUndef_, std::string_view arguments_) :
 		line(line_), key(key_), value(value_), isUndef(isUndef_), arguments(arguments_) {
 	}
 };
@@ -254,28 +253,27 @@ class LinePPState {
 	// level is the nesting level of #if constructs
 	int level = -1;
 	static const int maximumNestingLevel = 31;
-	int maskLevel() const noexcept {
+	[[nodiscard]] int maskLevel() const noexcept {
 		if (level >= 0) {
 			return 1 << level;
-		} else {
-			return 1;
 		}
+		return 1;
 	}
 public:
 	LinePPState() noexcept = default;
-	bool ValidLevel() const noexcept {
+	[[nodiscard]] bool ValidLevel() const noexcept {
 		return level >= 0 && level < maximumNestingLevel;
 	}
-	bool IsActive() const noexcept {
+	[[nodiscard]] bool IsActive() const noexcept {
 		return state == 0;
 	}
-	bool IsInactive() const noexcept {
+	[[nodiscard]] bool IsInactive() const noexcept {
 		return state != 0;
 	}
-	int ActiveState() const noexcept {
+	[[nodiscard]] int ActiveState() const noexcept {
 		return state ? inactiveFlag : 0;
 	}
-	bool CurrentIfTaken() const noexcept {
+	[[nodiscard]] bool CurrentIfTaken() const noexcept {
 		return (ifTaken & maskLevel()) != 0;
 	}
 	void StartSection(bool on) noexcept {
@@ -310,7 +308,7 @@ class LinePPState {
 class PPStates {
 	std::vector<LinePPState> vlls;
 public:
-	LinePPState ForLine(Sci_Position line) const noexcept {
+	[[nodiscard]] LinePPState ForLine(Sci_Position line) const noexcept {
 		if ((line > 0) && (vlls.size() > static_cast<size_t>(line))) {
 			return vlls[line];
 		}
@@ -322,6 +320,68 @@ class PPStates {
 	}
 };
 
+enum class BackQuotedString : int {
+	None,
+	RawString,
+	TemplateLiteral,
+};
+
+// string interpolating state
+struct InterpolatingState {
+	int state;
+	int braceCount;
+};
+
+struct Definition {
+	std::string_view name;
+	std::string_view value;
+	std::string_view arguments;
+};
+
+constexpr std::string_view TrimSpaceTab(std::string_view sv) noexcept {
+	while (!sv.empty() && IsASpaceOrTab(sv.front())) {
+		sv.remove_prefix(1);
+	}
+	return sv;
+}
+
+// Parse a macro definition, either from a #define line in a file or from keywords.
+// Either an object macro <NAME> <VALUE> or a function macro <NAME>(<ARGUMENTS>) <VALUE>.
+// VALUE is optional and is treated as "1" if missing.
+// #define ALLOW_PRINT
+// #define VERSION 37
+// #define VER(a,b) a*10+b
+// Whitespace separates macro and value in files but keywords use '=' separator.
+// 'endName' contains a set of characters that terminate the name of the macro.
+
+constexpr Definition ParseDefine(std::string_view definition, std::string_view endName) {
+	Definition ret;
+	definition = TrimSpaceTab(definition);
+	const size_t afterName = definition.find_first_of(endName);
+	if (afterName != std::string_view::npos) {
+		ret.name = definition.substr(0, afterName);
+		if (definition.at(afterName) == '(') {
+			// Macro
+			definition.remove_prefix(afterName+1);
+			const size_t closeBracket = definition.find(')');
+			if (closeBracket != std::string_view::npos) {
+				ret.arguments = definition.substr(0, closeBracket);
+				definition.remove_prefix(closeBracket+1);
+				if (!definition.empty() && (endName.find(definition.front()) != std::string_view::npos)) {
+					definition.remove_prefix(1);
+				}
+				ret.value = definition;
+			} // else malformed as requires closing bracket
+		} else {
+			ret.value = definition.substr(afterName+1);
+		}
+	} else {
+		ret.name = definition;
+		ret.value = "1";
+	}
+	return ret;
+}
+
 // An individual named option for use in an OptionSet
 
 // Options used for LexerCPP
@@ -333,7 +393,7 @@ struct OptionsCPP {
 	bool verbatimStringsAllowEscapes = false;
 	bool triplequotedStrings = false;
 	bool hashquotedStrings = false;
-	bool backQuotedStrings = false;
+	BackQuotedString backQuotedStrings = BackQuotedString::None;
 	bool escapeSequence = false;
 	bool fold = false;
 	bool foldSyntaxBased = true;
@@ -385,7 +445,10 @@ struct OptionSetCPP : public OptionSet<OptionsCPP> {
 			"Set to 1 to enable highlighting of hash-quoted strings.");
 
 		DefineProperty("lexer.cpp.backquoted.strings", &OptionsCPP::backQuotedStrings,
-			"Set to 1 to enable highlighting of back-quoted raw strings .");
+			"Set how to highlighting back-quoted strings. "
+			"0 (the default) no highlighting. "
+			"1 highlighted as Go raw string. "
+			"2 highlighted as JavaScript template literal.");
 
 		DefineProperty("lexer.cpp.escape.sequence", &OptionsCPP::escapeSequence,
 			"Set to 1 to enable highlighting of escape sequences in strings");
@@ -480,6 +543,7 @@ class LexerCPP : public ILexer5 {
 	CharacterSet setWordStart;
 	PPStates vlls;
 	std::vector<PPDefinition> ppDefineHistory;
+	std::map<Sci_Position, std::vector<InterpolatingState>> interpolatingAtEol;
 	WordList keywords;
 	WordList keywords2;
 	WordList keywords3;
@@ -490,25 +554,25 @@ class LexerCPP : public ILexer5 {
 		std::string value;
 		std::string arguments;
 		SymbolValue() noexcept = default;
-		SymbolValue(const std::string &value_, const std::string &arguments_) : value(value_), arguments(arguments_) {
+		SymbolValue(std::string_view value_, std::string_view arguments_) : value(value_), arguments(arguments_) {
 		}
 		SymbolValue &operator = (const std::string &value_) {
 			value = value_;
 			arguments.clear();
 			return *this;
 		}
-		bool IsMacro() const noexcept {
+		[[nodiscard]] bool IsMacro() const noexcept {
 			return !arguments.empty();
 		}
 	};
-	typedef std::map<std::string, SymbolValue> SymbolTable;
+	using SymbolTable = std::map<std::string, SymbolValue>;
 	SymbolTable preprocessorDefinitionsStart;
 	OptionsCPP options;
 	OptionSetCPP osCPP;
 	EscapeSequence escapeSeq;
 	SparseState<std::string> rawStringTerminators;
 	enum { ssIdentifier, ssDocKeyword };
-	SubStyles subStyles;
+	SubStyles subStyles{ styleSubable, SubStylesFirst, SubStylesAvailable, inactiveFlag };
 	std::string returnBuffer;
 public:
 	explicit LexerCPP(bool caseSensitive_) :
@@ -518,40 +582,38 @@ class LexerCPP : public ILexer5 {
 		setAddOp("+-"),
 		setMultOp("*/%"),
 		setRelOp("=!<>"),
-		setLogicalOp("|&"),
-		subStyles(styleSubable, 0x80, 0x40, inactiveFlag) {
+		setLogicalOp("|&") {
 	}
 	// Deleted so LexerCPP objects can not be copied.
 	LexerCPP(const LexerCPP &) = delete;
 	LexerCPP(LexerCPP &&) = delete;
 	void operator=(const LexerCPP &) = delete;
 	void operator=(LexerCPP &&) = delete;
-	virtual ~LexerCPP() {
-	}
+	virtual ~LexerCPP() = default;
 	void SCI_METHOD Release() noexcept override {
 		delete this;
 	}
 	int SCI_METHOD Version() const noexcept override {
 		return lvRelease5;
 	}
-	const char * SCI_METHOD PropertyNames() override {
+	const char *SCI_METHOD PropertyNames() override {
 		return osCPP.PropertyNames();
 	}
 	int SCI_METHOD PropertyType(const char *name) override {
 		return osCPP.PropertyType(name);
 	}
-	const char * SCI_METHOD DescribeProperty(const char *name) override {
+	const char *SCI_METHOD DescribeProperty(const char *name) override {
 		return osCPP.DescribeProperty(name);
 	}
 	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
-	const char * SCI_METHOD DescribeWordListSets() override {
+	const char *SCI_METHOD DescribeWordListSets() override {
 		return osCPP.DescribeWordListSets();
 	}
 	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
 	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
 	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
 
-	void * SCI_METHOD PrivateCall(int, void *) noexcept override {
+	void *SCI_METHOD PrivateCall(int, void *) noexcept override {
 		return nullptr;
 	}
 
@@ -585,7 +647,7 @@ class LexerCPP : public ILexer5 {
 	int SCI_METHOD DistanceToSecondaryStyles() noexcept override {
 		return inactiveFlag;
 	}
-	const char * SCI_METHOD GetSubStyleBases() noexcept override {
+	const char *SCI_METHOD GetSubStyleBases() noexcept override {
 		return styleSubable;
 	}
 	int SCI_METHOD NamedStyles() override {
@@ -593,7 +655,7 @@ class LexerCPP : public ILexer5 {
 			sizeLexicalClasses) +
 			inactiveFlag;
 	}
-	const char * SCI_METHOD NameOfStyle(int style) override {
+	const char *SCI_METHOD NameOfStyle(int style) override {
 		if (style >= NamedStyles())
 			return "";
 		if (style < sizeLexicalClasses)
@@ -601,7 +663,7 @@ class LexerCPP : public ILexer5 {
 		// TODO: inactive and substyles
 		return "";
 	}
-	const char * SCI_METHOD TagsOfStyle(int style) override {
+	const char *SCI_METHOD TagsOfStyle(int style) override {
 		if (style >= NamedStyles())
 			return "Excess";
 		returnBuffer.clear();
@@ -633,7 +695,7 @@ class LexerCPP : public ILexer5 {
 		}
 		return "";
 	}
-	const char * SCI_METHOD DescriptionOfStyle(int style) override {
+	const char *SCI_METHOD DescriptionOfStyle(int style) override {
 		if (style >= NamedStyles())
 			return "";
 		if (style < sizeLexicalClasses)
@@ -643,13 +705,13 @@ class LexerCPP : public ILexer5 {
 	}
 
 	// ILexer5 methods
-	const char * SCI_METHOD GetName() override {
+	const char *SCI_METHOD GetName() override {
 		return caseSensitive ? "cpp" : "cppnocase";
 	}
 	int SCI_METHOD  GetIdentifier() override {
 		return caseSensitive ? SCLEX_CPP : SCLEX_CPPNOCASE;
 	}
-	const char * SCI_METHOD PropertyGet(const char *key) override;
+	const char *SCI_METHOD PropertyGet(const char *key) override;
 
 	static ILexer5 *LexerFactoryCPP() {
 		return new LexerCPP(true);
@@ -661,7 +723,7 @@ class LexerCPP : public ILexer5 {
 		return style & ~inactiveFlag;
 	}
 	void EvaluateTokens(Tokens &tokens, const SymbolTable &preprocessorDefinitions);
-	Tokens Tokenize(const std::string &expr) const;
+	[[nodiscard]] Tokens Tokenize(const std::string &expr) const;
 	bool EvaluateExpression(const std::string &expr, const SymbolTable &preprocessorDefinitions);
 };
 
@@ -678,7 +740,7 @@ Sci_Position SCI_METHOD LexerCPP::PropertySet(const char *key, const char *val)
 	return -1;
 }
 
-const char * SCI_METHOD LexerCPP::PropertyGet(const char *key) {
+const char *SCI_METHOD LexerCPP::PropertyGet(const char *key) {
 	return osCPP.PropertyGet(key);
 }
 
@@ -714,26 +776,8 @@ Sci_Position SCI_METHOD LexerCPP::WordListSet(int n, const char *wl) {
 				// Rebuild preprocessorDefinitions
 				preprocessorDefinitionsStart.clear();
 				for (int nDefinition = 0; nDefinition < ppDefinitions.Length(); nDefinition++) {
-					const char *cpDefinition = ppDefinitions.WordAt(nDefinition);
-					const char *cpEquals = strchr(cpDefinition, '=');
-					if (cpEquals) {
-						std::string name(cpDefinition, cpEquals - cpDefinition);
-						std::string val(cpEquals+1);
-						const size_t bracket = name.find('(');
-						const size_t bracketEnd = name.find(')');
-						if ((bracket != std::string::npos) && (bracketEnd != std::string::npos)) {
-							// Macro
-							std::string args = name.substr(bracket + 1, bracketEnd - bracket - 1);
-							name = name.substr(0, bracket);
-							preprocessorDefinitionsStart[name] = SymbolValue(val, args);
-						} else {
-							preprocessorDefinitionsStart[name] = val;
-						}
-					} else {
-						std::string name(cpDefinition);
-						std::string val("1");
-						preprocessorDefinitionsStart[name] = val;
-					}
+					const Definition def = ParseDefine(ppDefinitions.WordAt(nDefinition), "(=");
+					preprocessorDefinitionsStart[std::string(def.name)] = SymbolValue(def.value, def.arguments);
 				}
 			}
 		}
@@ -771,7 +815,21 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 	bool inRERange = false;
 	bool seenDocKeyBrace = false;
 
+	std::vector<InterpolatingState> interpolatingStack;
+
 	Sci_Position lineCurrent = styler.GetLine(startPos);
+	if (options.backQuotedStrings == BackQuotedString::TemplateLiteral) {
+		// code copied from LexPython
+		auto it = interpolatingAtEol.find(lineCurrent - 1);
+		if (it != interpolatingAtEol.end()) {
+			interpolatingStack = it->second;
+		}
+		it = interpolatingAtEol.lower_bound(lineCurrent);
+		if (it != interpolatingAtEol.end()) {
+			interpolatingAtEol.erase(it, interpolatingAtEol.end());
+		}
+	}
+
 	if ((MaskActive(initStyle) == SCE_C_PREPROCESSOR) ||
       (MaskActive(initStyle) == SCE_C_COMMENTLINE) ||
       (MaskActive(initStyle) == SCE_C_COMMENTLINEDOC)) {
@@ -864,6 +922,9 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 			if (!rawStringTerminator.empty()) {
 				rawSTNew.Set(lineCurrent-1, rawStringTerminator);
 			}
+			if (!interpolatingStack.empty()) {
+				interpolatingAtEol[sc.currentLine] = interpolatingStack;
+			}
 		}
 
 		// Handle line continuation generically.
@@ -899,8 +960,7 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 					sc.ChangeState(SCE_C_USERLITERAL|activitySet);
 				} else if (!(setWord.Contains(sc.ch)
 				   || (sc.ch == '\'')
-				   || ((sc.ch == '+' || sc.ch == '-') && (sc.chPrev == 'e' || sc.chPrev == 'E' ||
-				                                          sc.chPrev == 'p' || sc.chPrev == 'P')))) {
+				   || (AnyOf(sc.chPrev, 'e', 'E', 'p', 'P') && AnyOf(sc.ch, '+', '-')))) {
 					sc.SetState(SCE_C_DEFAULT|activitySet);
 				}
 				break;
@@ -1045,13 +1105,13 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 				} else if (sc.ch == '[' || sc.ch == '{') {
 					seenDocKeyBrace = true;
 				} else if (!setDoxygen.Contains(sc.ch)
-				           && !(seenDocKeyBrace && (sc.ch == ',' || sc.ch == '.'))) {
+				           && !(seenDocKeyBrace && AnyOf(sc.ch, ',', '.'))) {
 					if (!(IsASpace(sc.ch) || (sc.ch == 0))) {
 						sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR|activitySet);
 					} else {
 						sc.GetCurrentString(currentText, transform);
 						assert(!currentText.empty());
-						std::string currentSuffix = currentText.substr(1);
+						const std::string currentSuffix = currentText.substr(1);
 						if (!keywords3.InList(currentSuffix) && !keywords3.InList(currentText)) {
 							const int subStyleCDKW = classifierDocKeyWords.ValueFor(currentSuffix);
 							if (subStyleCDKW >= 0) {
@@ -1087,8 +1147,8 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 					}
 				} else if (sc.ch == '\\') {
 					if (options.escapeSequence) {
+						escapeSeq.resetEscapeState(sc.state, sc.chNext);
 						sc.SetState(SCE_C_ESCAPESEQUENCE|activitySet);
-						escapeSeq.resetEscapeState(sc.chNext);
 					}
 					sc.Forward(); // Skip all characters after the backslash
 				} else if (sc.ch == '\"') {
@@ -1101,20 +1161,9 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 				break;
 			case SCE_C_ESCAPESEQUENCE:
 				escapeSeq.consumeDigit();
-				if (!escapeSeq.atEscapeEnd(sc.ch)) {
-					break;
-				}
-				if (sc.ch == '"') {
-					sc.SetState(SCE_C_STRING|activitySet);
-					sc.ForwardSetState(SCE_C_DEFAULT|activitySet);
-				} else if (sc.ch == '\\') {
-					escapeSeq.resetEscapeState(sc.chNext);
-					sc.Forward();
-				} else {
-					sc.SetState(SCE_C_STRING|activitySet);
-					if (sc.atLineEnd) {
-						sc.ChangeState(SCE_C_STRINGEOL|activitySet);
-					}
+				if (escapeSeq.atEscapeEnd(sc.ch)) {
+					sc.SetState(escapeSeq.outerState);
+					continue;
 				}
 				break;
 			case SCE_C_HASHQUOTEDSTRING:
@@ -1131,7 +1180,21 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 					for (size_t termPos=rawStringTerminator.size(); termPos; termPos--)
 						sc.Forward();
 					sc.SetState(SCE_C_DEFAULT|activitySet);
-					rawStringTerminator.clear();
+					if (interpolatingStack.empty()) {
+						rawStringTerminator.clear();
+					}
+				} else if (options.backQuotedStrings == BackQuotedString::TemplateLiteral) {
+					if (sc.ch == '\\') {
+						if (options.escapeSequence) {
+							escapeSeq.resetEscapeState(sc.state, sc.chNext);
+							sc.SetState(SCE_C_ESCAPESEQUENCE|activitySet);
+						}
+						sc.Forward(); // Skip all characters after the backslash
+					} else if (sc.Match('$', '{')) {
+						interpolatingStack.push_back({sc.state, 1});
+						sc.SetState(SCE_C_OPERATOR|activitySet);
+						sc.Forward();
+					}
 				}
 				break;
 			case SCE_C_CHARACTER:
@@ -1222,7 +1285,7 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 			} else if (options.hashquotedStrings && sc.Match('#', '\"')) {
 				sc.SetState(SCE_C_HASHQUOTEDSTRING|activitySet);
 				sc.Forward();
-			} else if (options.backQuotedStrings && sc.Match('`')) {
+			} else if ((options.backQuotedStrings != BackQuotedString::None) && sc.Match('`')) {
 				sc.SetState(SCE_C_STRINGRAW|activitySet);
 				rawStringTerminator = "`";
 			} else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
@@ -1336,7 +1399,7 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 									// Inactive, if expression true then may become active if parent scope active
 									assert(sc.state == (SCE_C_PREPROCESSOR | inactiveFlag));
 									// Similar to #if
-									std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 4, true);
+									const std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 4, true);
 									const bool ifGood = EvaluateExpression(restOfLine, preprocessorDefinitions);
 									if (ifGood) {
 										preproc.InvertCurrentLevel();
@@ -1358,41 +1421,11 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 							sc.ChangeState(SCE_C_PREPROCESSOR|activitySet);
 						} else if (sc.Match("define")) {
 							if (options.updatePreprocessor && preproc.IsActive()) {
-								std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 6, true);
-								size_t startName = 0;
-								while ((startName < restOfLine.length()) && IsSpaceOrTab(restOfLine[startName]))
-									startName++;
-								size_t endName = startName;
-								while ((endName < restOfLine.length()) && setWord.Contains(restOfLine[endName]))
-									endName++;
-								std::string key = restOfLine.substr(startName, endName-startName);
-								if ((endName < restOfLine.length()) && (restOfLine.at(endName) == '(')) {
-									// Macro
-									size_t endArgs = endName;
-									while ((endArgs < restOfLine.length()) && (restOfLine[endArgs] != ')'))
-										endArgs++;
-									std::string args = restOfLine.substr(endName + 1, endArgs - endName - 1);
-									size_t startValue = endArgs+1;
-									while ((startValue < restOfLine.length()) && IsSpaceOrTab(restOfLine[startValue]))
-										startValue++;
-									std::string value;
-									if (startValue < restOfLine.length())
-										value = restOfLine.substr(startValue);
-									preprocessorDefinitions[key] = SymbolValue(value, args);
-									ppDefineHistory.push_back(PPDefinition(lineCurrent, key, value, false, args));
-									definitionsChanged = true;
-								} else {
-									// Value
-									size_t startValue = endName;
-									while ((startValue < restOfLine.length()) && IsSpaceOrTab(restOfLine[startValue]))
-										startValue++;
-									std::string value = restOfLine.substr(startValue);
-									if (OnlySpaceOrTab(value))
-										value = "1";	// No value defaults to 1
-									preprocessorDefinitions[key] = value;
-									ppDefineHistory.push_back(PPDefinition(lineCurrent, key, value));
-									definitionsChanged = true;
-								}
+								const std::string restOfLine = GetRestOfLine(styler, sc.currentPos + 6, true);
+								const Definition def = ParseDefine(restOfLine, "( \t");
+								preprocessorDefinitions[std::string(def.name)] = SymbolValue(def.value, def.arguments);
+								ppDefineHistory.emplace_back(lineCurrent, def.name, def.value, false, def.arguments);
+								definitionsChanged = true;
 							}
 						} else if (sc.Match("undef")) {
 							if (options.updatePreprocessor && preproc.IsActive()) {
@@ -1401,7 +1434,7 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 								if (!tokens.empty()) {
 									const std::string key = tokens[0];
 									preprocessorDefinitions.erase(key);
-									ppDefineHistory.push_back(PPDefinition(lineCurrent, key, "", true));
+									ppDefineHistory.emplace_back(lineCurrent, key, "", true, "");
 									definitionsChanged = true;
 								}
 							}
@@ -1410,6 +1443,19 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 				}
 			} else if (isoperator(sc.ch)) {
 				sc.SetState(SCE_C_OPERATOR|activitySet);
+				if (!interpolatingStack.empty() && AnyOf(sc.ch, '{', '}')) {
+					InterpolatingState &current = interpolatingStack.back();
+					if (sc.ch == '{') {
+						current.braceCount += 1;
+					} else {
+						current.braceCount -= 1;
+						if (current.braceCount == 0) {
+							sc.ForwardSetState(current.state);
+							interpolatingStack.pop_back();
+							continue;
+						}
+					}
+				}
 			}
 		}
 
@@ -1749,8 +1795,8 @@ Tokens LexerCPP::Tokenize(const std::string &expr) const {
 				word += *cp;
 				cp++;
 			}
-		} else if (IsSpaceOrTab(*cp)) {
-			while (IsSpaceOrTab(*cp)) {
+		} else if (IsASpaceOrTab(*cp)) {
+			while (IsASpaceOrTab(*cp)) {
 				word += *cp;
 				cp++;
 			}
diff --git a/src/lexilla/lexers/LexD.cxx b/src/lexilla/lexers/LexD.cxx
index 5b8dab9b8..087f7ea24 100644
--- a/src/lexilla/lexers/LexD.cxx
+++ b/src/lexilla/lexers/LexD.cxx
@@ -198,9 +198,6 @@ class LexerD : public DefaultLexer {
 	static ILexer5 *LexerFactoryD() {
 		return new LexerD(true);
 	}
-	static ILexer5 *LexerFactoryDInsensitive() {
-		return new LexerD(false);
-	}
 };
 
 Sci_Position SCI_METHOD LexerD::PropertySet(const char *key, const char *val) {
diff --git a/src/lexilla/lexers/LexErrorList.cxx b/src/lexilla/lexers/LexErrorList.cxx
index 1e2b75de4..acdbfeb48 100644
--- a/src/lexilla/lexers/LexErrorList.cxx
+++ b/src/lexilla/lexers/LexErrorList.cxx
@@ -5,20 +5,21 @@
 // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cstdio>
+#include <cstdarg>
 
 #include <string>
 #include <string_view>
+#include <initializer_list>
 
 #include "ILexer.h"
 #include "Scintilla.h"
 #include "SciLexer.h"
 
+#include "InList.h"
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "Accessor.h"
@@ -42,11 +43,7 @@ constexpr bool Is1To9(char ch) noexcept {
 	return (ch >= '1') && (ch <= '9');
 }
 
-bool IsAlphabetic(int ch) {
-	return IsASCII(ch) && isalpha(ch);
-}
-
-inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
+bool AtEOL(Accessor &styler, Sci_Position i) {
 	return (styler[i] == '\n') ||
 	       ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
 }
@@ -255,18 +252,16 @@ int RecogniseErrorListLine(const char *lineBuffer, Sci_PositionU lengthLine, Sci
 				} else if ((ch == ':' && chNext == ' ') || (ch == ' ')) {
 					// Possibly Delphi.. don't test against chNext as it's one of the strings below.
 					char word[512];
-					unsigned numstep;
+					unsigned numstep = 0;
 					if (ch == ' ')
 						numstep = 1; // ch was ' ', handle as if it's a delphi errorline, only add 1 to i.
 					else
 						numstep = 2; // otherwise add 2.
 					Sci_PositionU chPos = 0;
-					for (Sci_PositionU j = i + numstep; j < lengthLine && IsAlphabetic(lineBuffer[j]) && chPos < sizeof(word) - 1; j++)
+					for (Sci_PositionU j = i + numstep; j < lengthLine && IsUpperOrLowerCase(lineBuffer[j]) && chPos < sizeof(word) - 1; j++)
 						word[chPos++] = lineBuffer[j];
 					word[chPos] = 0;
-					if (!CompareCaseInsensitive(word, "error") || !CompareCaseInsensitive(word, "warning") ||
-						!CompareCaseInsensitive(word, "fatal") || !CompareCaseInsensitive(word, "catastrophic") ||
-						!CompareCaseInsensitive(word, "note") || !CompareCaseInsensitive(word, "remark")) {
+					if (InListCaseInsensitive(word, {"error", "warning", "fatal", "catastrophic", "note", "remark"})) {
 						state = stMsVc;
 					} else {
 						state = stUnrecognized;
@@ -363,12 +358,12 @@ void ColouriseErrorListLine(
 		int portionStyle = style;
 		while (const char *startSeq = strstr(linePortion, CSI)) {
 			if (startSeq > linePortion) {
-				styler.ColourTo(startPortion + static_cast<int>(startSeq - linePortion), portionStyle);
+				styler.ColourTo(startPortion + (startSeq - linePortion), portionStyle);
 			}
 			const char *endSeq = startSeq + 2;
 			while (!SequenceEnd(*endSeq))
 				endSeq++;
-			const Sci_Position endSeqPosition = startPortion + static_cast<Sci_Position>(endSeq - linePortion) + 1;
+			const Sci_Position endSeqPosition = startPortion + (endSeq - linePortion) + 1;
 			switch (*endSeq) {
 			case 0:
 				styler.ColourTo(endPos, SCE_ERR_ESCSEQ_UNKNOWN);
@@ -433,4 +428,4 @@ const char *const emptyWordListDesc[] = {
 
 }
 
-LexerModule lmErrorList(SCLEX_ERRORLIST, ColouriseErrorListDoc, "errorlist", 0, emptyWordListDesc);
+LexerModule lmErrorList(SCLEX_ERRORLIST, ColouriseErrorListDoc, "errorlist", nullptr, emptyWordListDesc);
diff --git a/src/lexilla/lexers/LexGDScript.cxx b/src/lexilla/lexers/LexGDScript.cxx
index 4f889c1bc..10f36f901 100644
--- a/src/lexilla/lexers/LexGDScript.cxx
+++ b/src/lexilla/lexers/LexGDScript.cxx
@@ -240,11 +240,10 @@ class LexerGDScript : public DefaultLexer {
 	OptionsGDScript options;
 	OptionSetGDScript osGDScript;
 	enum { ssIdentifier };
-	SubStyles subStyles;
+	SubStyles subStyles{styleSubable};
 public:
 	explicit LexerGDScript() :
-		DefaultLexer("gdscript", SCLEX_GDSCRIPT, lexicalClasses, ELEMENTS(lexicalClasses)),
-		subStyles(styleSubable, 0x80, 0x40, 0) {
+		DefaultLexer("gdscript", SCLEX_GDSCRIPT, lexicalClasses, ELEMENTS(lexicalClasses)) {
 	}
 	~LexerGDScript() override {
 	}
diff --git a/src/lexilla/lexers/LexHTML.cxx b/src/lexilla/lexers/LexHTML.cxx
index 0ed9f90b2..4a5e092de 100644
--- a/src/lexilla/lexers/LexHTML.cxx
+++ b/src/lexilla/lexers/LexHTML.cxx
@@ -14,6 +14,7 @@
 
 #include <string>
 #include <string_view>
+#include <vector>
 #include <map>
 #include <set>
 #include <functional>
@@ -21,6 +22,7 @@
 #include "ILexer.h"
 #include "Scintilla.h"
 #include "SciLexer.h"
+#include "InList.h"
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "Accessor.h"
@@ -28,6 +30,7 @@
 #include "CharacterSet.h"
 #include "LexerModule.h"
 #include "OptionSet.h"
+#include "SubStyles.h"
 #include "DefaultLexer.h"
 
 using namespace Scintilla;
@@ -68,27 +71,12 @@ unsigned char SafeGetUnsignedCharAt(Accessor &styler, Sci_Position position, cha
 	return styler.SafeGetCharAt(position, chDefault);
 }
 
-void GetTextSegment(Accessor &styler, Sci_PositionU start, Sci_PositionU end, char *s, size_t len) {
-	Sci_PositionU i = 0;
-	for (; (i < end - start + 1) && (i < len-1); i++) {
-		s[i] = MakeLowerCase(styler[start + i]);
-	}
-	s[i] = '\0';
-}
-
-std::string GetStringSegment(Accessor &styler, Sci_PositionU start, Sci_PositionU end) {
-	std::string s;
-	Sci_PositionU i = 0;
-	for (; (i < end - start + 1); i++) {
-		s.push_back(MakeLowerCase(styler[start + i]));
-	}
-	return s;
-}
+// Put an upper limit to bound time taken for unexpected text.
+constexpr Sci_PositionU maxLengthCheck = 200;
 
 std::string GetNextWord(Accessor &styler, Sci_PositionU start) {
 	std::string ret;
-	Sci_PositionU i = 0;
-	for (; i < 200; i++) {	// Put an upper limit to bound time taken for unexpected text.
+	for (Sci_PositionU i = 0; i < maxLengthCheck; i++) {
 		const char ch = styler.SafeGetCharAt(start + i);
 		if ((i == 0) && !IsAWordStart(ch))
 			break;
@@ -99,25 +87,29 @@ std::string GetNextWord(Accessor &styler, Sci_PositionU start) {
 	return ret;
 }
 
+bool Contains(const std::string &s, std::string_view search) noexcept {
+	return s.find(search) != std::string::npos;
+}
+
 script_type segIsScriptingIndicator(Accessor &styler, Sci_PositionU start, Sci_PositionU end, script_type prevValue) {
-	char s[100];
-	GetTextSegment(styler, start, end, s, sizeof(s));
-	//Platform::DebugPrintf("Scripting indicator [%s]\n", s);
-	if (strstr(s, "vbs"))
+	const std::string s = styler.GetRangeLowered(start, end+1);
+	if (Contains(s, "vbs"))
 		return eScriptVBS;
-	if (strstr(s, "pyth"))
+	if (Contains(s, "pyth"))
 		return eScriptPython;
 	// https://html.spec.whatwg.org/multipage/scripting.html#attr-script-type
 	// https://mimesniff.spec.whatwg.org/#javascript-mime-type
-	if (strstr(s, "javas") || strstr(s, "ecmas") || strstr(s, "module") || strstr(s, "jscr"))
+	if (Contains(s, "javas") || Contains(s, "ecmas") || Contains(s, "module") || Contains(s, "jscr"))
 		return eScriptJS;
-	if (strstr(s, "php"))
+	if (Contains(s, "php"))
 		return eScriptPHP;
-	if (strstr(s, "xml")) {
-		const char *xml = strstr(s, "xml");
-		for (const char *t=s; t<xml; t++) {
-			if (!IsASpace(*t)) {
-				return prevValue;
+	if (Contains(s, "xml")) {
+		const size_t xml = s.find("xml");
+		if (xml != std::string::npos) {
+			for (size_t t = 0; t < xml; t++) {
+				if (!IsASpace(s[t])) {
+					return prevValue;
+				}
 			}
 		}
 		return eScriptXML;
@@ -128,7 +120,7 @@ script_type segIsScriptingIndicator(Accessor &styler, Sci_PositionU start, Sci_P
 
 int PrintScriptingIndicatorOffset(Accessor &styler, Sci_PositionU start, Sci_PositionU end) {
 	int iResult = 0;
-	std::string s = GetStringSegment(styler, start, end);
+	const std::string s = styler.GetRangeLowered(start, end+1);
 	if (0 == strncmp(s.c_str(), "php", 3)) {
 		iResult = 3;
 	}
@@ -153,7 +145,7 @@ script_type ScriptOfState(int state) noexcept {
 	}
 }
 
-int statePrintForState(int state, script_mode inScriptType) noexcept {
+constexpr int statePrintForState(int state, script_mode inScriptType) noexcept {
 	int StateToPrint = state;
 
 	if (state >= SCE_HJ_START) {
@@ -169,8 +161,8 @@ int statePrintForState(int state, script_mode inScriptType) noexcept {
 	return StateToPrint;
 }
 
-int stateForPrintState(int StateToPrint) noexcept {
-	int state;
+constexpr int stateForPrintState(int StateToPrint) noexcept {
+	int state = StateToPrint;
 
 	if ((StateToPrint >= SCE_HPA_START) && (StateToPrint <= SCE_HPA_IDENTIFIER)) {
 		state = StateToPrint - SCE_HA_PYTHON;
@@ -178,8 +170,6 @@ int stateForPrintState(int StateToPrint) noexcept {
 		state = StateToPrint - SCE_HA_VBS;
 	} else if ((StateToPrint >= SCE_HJA_START) && (StateToPrint <= SCE_HJA_REGEX)) {
 		state = StateToPrint - SCE_HA_JS;
-	} else {
-		state = StateToPrint;
 	}
 
 	return state;
@@ -189,8 +179,8 @@ constexpr bool IsNumberChar(char ch) noexcept {
 	return IsADigit(ch) || ch == '.' || ch == '-' || ch == '#';
 }
 
-bool isStringState(int state) noexcept {
-	bool bResult;
+constexpr bool isStringState(int state) noexcept {
+	bool bResult = false;
 
 	switch (state) {
 	case SCE_HJ_DOUBLESTRING:
@@ -214,13 +204,12 @@ bool isStringState(int state) noexcept {
 		bResult = true;
 		break;
 	default :
-		bResult = false;
 		break;
 	}
 	return bResult;
 }
 
-bool stateAllowsTermination(int state) noexcept {
+constexpr bool stateAllowsTermination(int state) noexcept {
 	bool allowTermination = !isStringState(state);
 	if (allowTermination) {
 		switch (state) {
@@ -228,12 +217,15 @@ bool stateAllowsTermination(int state) noexcept {
 		case SCE_HP_COMMENTLINE:
 		case SCE_HPA_COMMENTLINE:
 			allowTermination = false;
+			break;
+		default:
+			break;
 		}
 	}
 	return allowTermination;
 }
 
-bool isPreProcessorEndTag(int state, int ch) {
+bool isPreProcessorEndTag(int state, int ch) noexcept {
 	const script_type type = ScriptOfState(state);
 	if (state == SCE_H_ASP || AnyOf(type, eScriptVBS, eScriptJS, eScriptPython)) {
 		return ch == '%';
@@ -245,8 +237,8 @@ bool isPreProcessorEndTag(int state, int ch) {
 }
 
 // not really well done, since it's only comments that should lex the %> and <%
-bool isCommentASPState(int state) noexcept {
-	bool bResult;
+constexpr bool isCommentASPState(int state) noexcept {
+	bool bResult = false;
 
 	switch (state) {
 	case SCE_HJ_COMMENT:
@@ -259,21 +251,32 @@ bool isCommentASPState(int state) noexcept {
 		bResult = true;
 		break;
 	default :
-		bResult = false;
 		break;
 	}
 	return bResult;
 }
 
-bool classifyAttribHTML(script_mode inScriptType, Sci_PositionU start, Sci_PositionU end, const WordList &keywords, Accessor &styler) {
-	char chAttr = SCE_H_ATTRIBUTEUNKNOWN;
+bool classifyAttribHTML(script_mode inScriptType, Sci_PositionU start, Sci_PositionU end, const WordList &keywords, const WordClassifier &classifier, Accessor &styler, const std::string &tag) {
+	int chAttr = SCE_H_ATTRIBUTEUNKNOWN;
 	bool isLanguageType = false;
 	if (IsNumberChar(styler[start])) {
 		chAttr = SCE_H_NUMBER;
 	} else {
-		const std::string s = GetStringSegment(styler, start, end);
-		if (keywords.InList(s.c_str()))
+		const std::string s = styler.GetRangeLowered(start, end+1);
+		if (keywords.InList(s)) {
 			chAttr = SCE_H_ATTRIBUTE;
+		} else {
+			int subStyle = classifier.ValueFor(s);
+			if (subStyle < 0) {
+				// Didn't find attribute, check for tag.attribute
+				const std::string tagAttribute = tag + "." + s;
+				subStyle = classifier.ValueFor(tagAttribute);
+			}
+			if (subStyle >= 0) {
+				chAttr = subStyle;
+			}
+		}
+
 		if (inScriptType == eNonHtmlScript) {
 			// see https://html.spec.whatwg.org/multipage/scripting.html#script-processing-model
 			if (s == "type" || s == "language") {
@@ -289,7 +292,7 @@ bool classifyAttribHTML(script_mode inScriptType, Sci_PositionU start, Sci_Posit
 }
 
 // https://html.spec.whatwg.org/multipage/custom-elements.html#custom-elements-core-concepts
-bool isHTMLCustomElement(const std::string &tag) {
+bool isHTMLCustomElement(const std::string &tag) noexcept {
 	// check valid HTML custom element name: starts with an ASCII lower alpha and contains hyphen.
 	// IsUpperOrLowerCase() is used for `html.tags.case.sensitive=1`.
 	if (tag.length() < 2 || !IsUpperOrLowerCase(tag[0])) {
@@ -302,10 +305,11 @@ bool isHTMLCustomElement(const std::string &tag) {
 }
 
 int classifyTagHTML(Sci_PositionU start, Sci_PositionU end,
-                           const WordList &keywords, Accessor &styler, bool &tagDontFold,
+                    const WordList &keywords, const WordClassifier &classifier, Accessor &styler, bool &tagDontFold,
                     bool caseSensitive, bool isXml, bool allowScripts,
-                    const std::set<std::string> &nonFoldingTags) {
-	std::string tag;
+                    const std::set<std::string> &nonFoldingTags,
+                    std::string &tag) {
+	tag.clear();
 	// Copy after the '<' and stop before ' '
 	for (Sci_PositionU cPos = start; cPos <= end; cPos++) {
 		const char ch = styler[cPos];
@@ -321,13 +325,18 @@ int classifyTagHTML(Sci_PositionU start, Sci_PositionU end,
 	//...to find it in the list of no-container-tags
 	tagDontFold = (!isXml) && (nonFoldingTags.count(tag) > 0);
 	// No keywords -> all are known
-	char chAttr = SCE_H_TAGUNKNOWN;
+	int chAttr = SCE_H_TAGUNKNOWN;
 	if (!tag.empty() && (tag[0] == '!')) {
 		chAttr = SCE_H_SGML_DEFAULT;
-	} else if (!keywords || keywords.InList(tag.c_str())) {
+	} else if (!keywords || keywords.InList(tag)) {
 		chAttr = SCE_H_TAG;
 	} else if (!isXml && isHTMLCustomElement(tag)) {
 		chAttr = SCE_H_TAG;
+	} else {
+		const int subStyle = classifier.ValueFor(tag);
+		if (subStyle >= 0) {
+			chAttr = subStyle;
+		}
 	}
 	if (chAttr != SCE_H_TAGUNKNOWN) {
 		styler.ColourTo(end, chAttr);
@@ -336,11 +345,11 @@ int classifyTagHTML(Sci_PositionU start, Sci_PositionU end,
 		if (allowScripts && (tag == "script")) {
 			// check to see if this is a self-closing tag by sniffing ahead
 			bool isSelfClose = false;
-			for (Sci_PositionU cPos = end; cPos <= end + 200; cPos++) {
+			for (Sci_PositionU cPos = end; cPos <= end + maxLengthCheck; cPos++) {
 				const char ch = styler.SafeGetCharAt(cPos, '\0');
 				if (ch == '\0' || ch == '>')
 					break;
-				else if (ch == '/' && styler.SafeGetCharAt(cPos + 1, '\0') == '>') {
+				if (ch == '/' && styler.SafeGetCharAt(cPos + 1, '\0') == '>') {
 					isSelfClose = true;
 					break;
 				}
@@ -357,35 +366,40 @@ int classifyTagHTML(Sci_PositionU start, Sci_PositionU end,
 }
 
 void classifyWordHTJS(Sci_PositionU start, Sci_PositionU end,
-                             const WordList &keywords, Accessor &styler, script_mode inScriptType) {
-	char s[30 + 1];
-	Sci_PositionU i = 0;
-	for (; i < end - start + 1 && i < 30; i++) {
-		s[i] = styler[start + i];
-	}
-	s[i] = '\0';
-
-	char chAttr = SCE_HJ_WORD;
+                             const WordList &keywords, const WordClassifier &classifier, const WordClassifier &classifierServer, Accessor &styler, script_mode inScriptType) {
+	const std::string s = styler.GetRange(start, end+1);
+	int chAttr = SCE_HJ_WORD;
 	const bool wordIsNumber = IsADigit(s[0]) || ((s[0] == '.') && IsADigit(s[1]));
 	if (wordIsNumber) {
 		chAttr = SCE_HJ_NUMBER;
 	} else if (keywords.InList(s)) {
 		chAttr = SCE_HJ_KEYWORD;
+	} else {
+		const int subStyle = (inScriptType == eNonHtmlScript) ? classifier.ValueFor(s) : classifierServer.ValueFor(s);
+		if (subStyle >= 0) {
+			chAttr = subStyle;
+		}
 	}
+
 	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
 }
 
-int classifyWordHTVB(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, Accessor &styler, script_mode inScriptType) {
-	char chAttr = SCE_HB_IDENTIFIER;
+int classifyWordHTVB(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, const WordClassifier &classifier, Accessor &styler, script_mode inScriptType) {
+	int chAttr = SCE_HB_IDENTIFIER;
 	const bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.');
 	if (wordIsNumber) {
 		chAttr = SCE_HB_NUMBER;
 	} else {
-		std::string s = GetStringSegment(styler, start, end);
-		if (keywords.InList(s.c_str())) {
+		const std::string s = styler.GetRangeLowered(start, end+1);
+		if (keywords.InList(s)) {
 			chAttr = SCE_HB_WORD;
 			if (s == "rem")
 				chAttr = SCE_HB_COMMENTLINE;
+		} else {
+			const int subStyle = classifier.ValueFor(s);
+			if (subStyle >= 0) {
+				chAttr = subStyle;
+			}
 		}
 	}
 	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
@@ -395,61 +409,64 @@ int classifyWordHTVB(Sci_PositionU start, Sci_PositionU end, const WordList &key
 		return SCE_HB_DEFAULT;
 }
 
-void classifyWordHTPy(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, Accessor &styler, std::string &prevWord, script_mode inScriptType, bool isMako) {
+void classifyWordHTPy(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, const WordClassifier &classifier, Accessor &styler, std::string &prevWord, script_mode inScriptType, bool isMako) {
 	const bool wordIsNumber = IsADigit(styler[start]);
-	std::string s;
-	for (Sci_PositionU i = 0; i < end - start + 1 && i < 30; i++) {
-		s.push_back(styler[start + i]);
-	}
-	char chAttr = SCE_HP_IDENTIFIER;
+	const std::string s = styler.GetRange(start, end + 1);
+	int chAttr = SCE_HP_IDENTIFIER;
 	if (prevWord == "class")
 		chAttr = SCE_HP_CLASSNAME;
 	else if (prevWord == "def")
 		chAttr = SCE_HP_DEFNAME;
 	else if (wordIsNumber)
 		chAttr = SCE_HP_NUMBER;
-	else if (keywords.InList(s.c_str()))
+	else if (keywords.InList(s))
 		chAttr = SCE_HP_WORD;
 	else if (isMako && (s == "block"))
 		chAttr = SCE_HP_WORD;
+	else {
+		const int subStyle = classifier.ValueFor(s);
+		if (subStyle >= 0) {
+			chAttr = subStyle;
+		}
+	}
 	styler.ColourTo(end, statePrintForState(chAttr, inScriptType));
 	prevWord = s;
 }
 
 // Update the word colour to default or keyword
 // Called when in a PHP word
-void classifyWordHTPHP(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, Accessor &styler) {
-	char chAttr = SCE_HPHP_DEFAULT;
+void classifyWordHTPHP(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, const WordClassifier &classifier, Accessor &styler) {
+	int chAttr = SCE_HPHP_DEFAULT;
 	const bool wordIsNumber = IsADigit(styler[start]) || (styler[start] == '.' && start+1 <= end && IsADigit(styler[start+1]));
 	if (wordIsNumber) {
 		chAttr = SCE_HPHP_NUMBER;
 	} else {
-		std::string s = GetStringSegment(styler, start, end);
-		if (keywords.InList(s.c_str()))
+		const std::string s = styler.GetRangeLowered(start, end+1);;
+		if (keywords.InList(s)) {
 			chAttr = SCE_HPHP_WORD;
+		} else {
+			const int subStyle = classifier.ValueFor(s);
+			if (subStyle >= 0) {
+				chAttr = subStyle;
+			}
+		}
 	}
 	styler.ColourTo(end, chAttr);
 }
 
 bool isWordHSGML(Sci_PositionU start, Sci_PositionU end, const WordList &keywords, Accessor &styler) {
-	std::string s;
-	for (Sci_PositionU i = 0; i < end - start + 1 && i < 30; i++) {
-		s.push_back(styler[start + i]);
-	}
-	return keywords.InList(s.c_str());
+	const std::string s = styler.GetRange(start, end + 1);
+	return keywords.InList(s);
 }
 
 bool isWordCdata(Sci_PositionU start, Sci_PositionU end, Accessor &styler) {
-	std::string s;
-	for (Sci_PositionU i = 0; i < end - start + 1 && i < 30; i++) {
-		s.push_back(styler[start + i]);
-	}
+	const std::string s = styler.GetRange(start, end + 1);
 	return s == "[CDATA[";
 }
 
 // Return the first state to reach when entering a scripting language
-int StateForScript(script_type scriptLanguage) noexcept {
-	int Result;
+constexpr int StateForScript(script_type scriptLanguage) noexcept {
+	int Result = SCE_HJ_START;
 	switch (scriptLanguage) {
 	case eScriptVBS:
 		Result = SCE_HB_START;
@@ -470,7 +487,6 @@ int StateForScript(script_type scriptLanguage) noexcept {
 		Result = SCE_H_COMMENT;
 		break;
 	default :
-		Result = SCE_HJ_START;
 		break;
 	}
 	return Result;
@@ -489,34 +505,30 @@ constexpr bool IsPhpWordChar(int ch) noexcept {
 	return IsADigit(ch) || IsPhpWordStart(ch);
 }
 
-bool InTagState(int state) noexcept {
-	return state == SCE_H_TAG || state == SCE_H_TAGUNKNOWN ||
-	       state == SCE_H_SCRIPT ||
-	       state == SCE_H_ATTRIBUTE || state == SCE_H_ATTRIBUTEUNKNOWN ||
-	       state == SCE_H_NUMBER || state == SCE_H_OTHER ||
-	       state == SCE_H_DOUBLESTRING || state == SCE_H_SINGLESTRING;
+constexpr bool InTagState(int state) noexcept {
+	return AnyOf(state, SCE_H_TAG, SCE_H_TAGUNKNOWN, SCE_H_SCRIPT,
+	       SCE_H_ATTRIBUTE, SCE_H_ATTRIBUTEUNKNOWN,
+	       SCE_H_NUMBER, SCE_H_OTHER,
+	       SCE_H_DOUBLESTRING, SCE_H_SINGLESTRING);
 }
 
-bool IsCommentState(const int state) noexcept {
+constexpr bool IsCommentState(const int state) noexcept {
 	return state == SCE_H_COMMENT || state == SCE_H_SGML_COMMENT;
 }
 
-bool IsScriptCommentState(const int state) noexcept {
-	return state == SCE_HJ_COMMENT || state == SCE_HJ_COMMENTLINE || state == SCE_HJA_COMMENT ||
-		   state == SCE_HJA_COMMENTLINE || state == SCE_HB_COMMENTLINE || state == SCE_HBA_COMMENTLINE;
+constexpr bool IsScriptCommentState(const int state) noexcept {
+	return AnyOf(state, SCE_HJ_COMMENT, SCE_HJ_COMMENTLINE, SCE_HJA_COMMENT,
+		   SCE_HJA_COMMENTLINE, SCE_HB_COMMENTLINE, SCE_HBA_COMMENTLINE);
 }
 
 constexpr bool isLineEnd(int ch) noexcept {
 	return ch == '\r' || ch == '\n';
 }
 
-bool isMakoBlockEnd(const int ch, const int chNext, const std::string &blockType) {
+bool isMakoBlockEnd(const int ch, const int chNext, const std::string &blockType) noexcept {
 	if (blockType.empty()) {
 		return ((ch == '%') && (chNext == '>'));
-	} else if ((blockType == "inherit") ||
-			   (blockType == "namespace") ||
-			   (blockType == "include") ||
-			   (blockType == "page")) {
+	} else if (InList(blockType, { "inherit", "namespace", "include", "page" })) {
 		return ((ch == '/') && (chNext == '>'));
 	} else if (blockType == "%") {
 		if (ch == '/' && isLineEnd(chNext))
@@ -530,7 +542,7 @@ bool isMakoBlockEnd(const int ch, const int chNext, const std::string &blockType
 	}
 }
 
-bool isDjangoBlockEnd(const int ch, const int chNext, const std::string &blockType) {
+bool isDjangoBlockEnd(const int ch, const int chNext, const std::string &blockType) noexcept {
 	if (blockType.empty()) {
 		return false;
 	} else if (blockType == "%") {
@@ -563,7 +575,7 @@ class PhpNumberState {
 	[[nodiscard]] bool isInvalid() const noexcept { return invalid; }
 	[[nodiscard]] bool isFinished() const noexcept { return finished; }
 
-	bool init(int ch, int chPlus1, int chPlus2) {
+	bool init(int ch, int chPlus1, int chPlus2) noexcept {
 		base = BASE_10;
 		decimalPart = false;
 		exponentPart = false;
@@ -600,7 +612,7 @@ class PhpNumberState {
 		return true;
 	}
 
-	bool check(int ch, int chPlus1) {
+	bool check(int ch, int chPlus1) noexcept {
 		if (strchr(digitList[base] + !betweenDigits, ch) != nullptr) {
 			if (leadingZero) {
 				invalidBase8 = invalidBase8 || strchr(digitList[BASE_8] + !betweenDigits, ch) == nullptr;
@@ -655,7 +667,7 @@ class PhpNumberState {
 	}
 };
 
-bool isPHPStringState(int state) noexcept {
+constexpr bool isPHPStringState(int state) noexcept {
 	return
 	    (state == SCE_HPHP_HSTRING) ||
 	    (state == SCE_HPHP_SIMPLESTRING) ||
@@ -664,7 +676,6 @@ bool isPHPStringState(int state) noexcept {
 }
 
 Sci_Position FindPhpStringDelimiter(std::string &phpStringDelimiter, Sci_Position i, const Sci_Position lengthDoc, Accessor &styler, bool &isSimpleString) {
-	Sci_Position j;
 	const Sci_Position beginning = i - 1;
 	bool isQuoted = false;
 
@@ -685,7 +696,8 @@ Sci_Position FindPhpStringDelimiter(std::string &phpStringDelimiter, Sci_Positio
 	}
 	phpStringDelimiter.push_back(ch);
 	i++;
-	for (j = i; j < lengthDoc && !isLineEnd(styler[j]); j++) {
+	Sci_Position j = i;
+	for (; j < lengthDoc && !isLineEnd(styler[j]); j++) {
 		if (!IsPhpWordChar(styler[j]) && isQuoted) {
 			if (((isSimpleString && styler[j] == '\'') || (!isSimpleString && styler[j] == '\"')) && isLineEnd(styler.SafeGetCharAt(j + 1))) {
 				isQuoted = false;
@@ -742,7 +754,7 @@ const char * const phpscriptWordListDesc[] = {
 };
 
 struct OptionSetHTML : public OptionSet<OptionsHTML> {
-	OptionSetHTML(bool isPHPScript_) {
+	explicit OptionSetHTML(bool isPHPScript_) {
 
 		DefineProperty("asp.default.language", &OptionsHTML::aspDefaultLanguage,
 			"Script in ASP code is initially assumed to be in JavaScript. "
@@ -789,6 +801,10 @@ struct OptionSetHTML : public OptionSet<OptionsHTML> {
 	}
 };
 
+constexpr char styleSubable[] = { SCE_H_TAG, SCE_H_ATTRIBUTE, SCE_HJ_WORD, SCE_HJA_WORD, SCE_HB_WORD, SCE_HP_WORD, SCE_HPHP_WORD, 0 };
+// Allow normal styles to be contiguous using 0x80 to 0xBF by assigning sub-styles from 0xC0 to 0xFF
+constexpr int SubStylesHTML = 0xC0;
+
 const LexicalClass lexicalClassesHTML[] = {
 	// Lexer HTML SCLEX_HTML SCE_H_ SCE_HJ_ SCE_HJA_ SCE_HB_ SCE_HBA_ SCE_HP_ SCE_HPHP_ SCE_HPA_:
 	0, "SCE_H_DEFAULT", "default", "Text",
@@ -993,6 +1009,7 @@ class LexerHTML : public DefaultLexer {
 	OptionsHTML options;
 	OptionSetHTML osHTML;
 	std::set<std::string> nonFoldingTags;
+	SubStyles subStyles{styleSubable,SubStylesHTML,SubStylesAvailable,0};
 public:
 	explicit LexerHTML(bool isXml_, bool isPHPScript_) :
 		DefaultLexer(
@@ -1030,6 +1047,35 @@ class LexerHTML : public DefaultLexer {
 	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
 	// No Fold as all folding performs in Lex.
 
+	int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) override {
+		return subStyles.Allocate(styleBase, numberStyles);
+	}
+	int SCI_METHOD SubStylesStart(int styleBase) override {
+		return subStyles.Start(styleBase);
+	}
+	int SCI_METHOD SubStylesLength(int styleBase) override {
+		return subStyles.Length(styleBase);
+	}
+	int SCI_METHOD StyleFromSubStyle(int subStyle) override {
+		const int styleBase = subStyles.BaseStyle(subStyle);
+		return styleBase;
+	}
+	int SCI_METHOD PrimaryStyleFromStyle(int style) override {
+		return style;
+	}
+	void SCI_METHOD FreeSubStyles() override {
+		subStyles.Free();
+	}
+	void SCI_METHOD SetIdentifiers(int style, const char *identifiers) override {
+		subStyles.SetIdentifiers(style, identifiers);
+	}
+	int SCI_METHOD DistanceToSecondaryStyles() override {
+		return 0;
+	}
+	const char *SCI_METHOD GetSubStyleBases() override {
+		return styleSubable;
+	}
+
 	static ILexer5 *LexerFactoryHTML() {
 		return new LexerHTML(false, false);
 	}
@@ -1069,6 +1115,8 @@ Sci_Position SCI_METHOD LexerHTML::WordListSet(int n, const char *wl) {
 	case 5:
 		wordListN = &keywords6;
 		break;
+	default:
+		break;
 	}
 	Sci_Position firstModification = -1;
 	if (wordListN) {
@@ -1081,10 +1129,20 @@ Sci_Position SCI_METHOD LexerHTML::WordListSet(int n, const char *wl) {
 
 void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
 	Accessor styler(pAccess, nullptr);
+
+	const WordClassifier &classifierTags = subStyles.Classifier(SCE_H_TAG);
+	const WordClassifier &classifierAttributes = subStyles.Classifier(SCE_H_ATTRIBUTE);
+	const WordClassifier &classifierJavaScript = subStyles.Classifier(SCE_HJ_WORD);
+	const WordClassifier &classifierJavaScriptServer = subStyles.Classifier(SCE_HJA_WORD);
+	const WordClassifier &classifierBasic = subStyles.Classifier(SCE_HB_WORD);
+	const WordClassifier &classifierPython = subStyles.Classifier(SCE_HP_WORD);
+	const WordClassifier &classifierPHP = subStyles.Classifier(SCE_HPHP_WORD);
+
 	if (isPHPScript && (startPos == 0)) {
 		initStyle = SCE_HPHP_DEFAULT;
 	}
 	styler.StartAt(startPos);
+	std::string lastTag;
 	std::string prevWord;
 	PhpNumberState phpNumber;
 	std::string phpStringDelimiter;
@@ -1095,7 +1153,7 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 	std::string djangoBlockType;
 	// If inside a tag, it may be a script tag, so reread from the start of line starting tag to ensure any language tags are seen
 	if (InTagState(state)) {
-		while ((startPos > 0) && (InTagState(styler.StyleAt(startPos - 1)))) {
+		while ((startPos > 0) && (InTagState(styler.StyleIndexAt(startPos - 1)))) {
 			const Sci_Position backLineStart = styler.LineStart(styler.GetLine(startPos-1));
 			length += startPos - backLineStart;
 			startPos = backLineStart;
@@ -1107,7 +1165,7 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 		while (startPos > 0 && (isPHPStringState(state) || !isLineEnd(styler[startPos - 1]))) {
 			startPos--;
 			length++;
-			state = styler.StyleAt(startPos);
+			state = styler.StyleIndexAt(startPos);
 		}
 		if (startPos == 0)
 			state = SCE_H_DEFAULT;
@@ -1123,6 +1181,8 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 		case SCE_H_ASP:
 			state = SCE_H_DEFAULT;
 			break;
+		default:
+			break;
 	}
 
 	Sci_Position lineCurrent = styler.GetLine(startPos);
@@ -1182,7 +1242,7 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 		Sci_Position back = startPos;
 		int style = 0;
 		while (--back) {
-			style = styler.StyleAt(back);
+			style = styler.StyleIndexAt(back);
 			if (style < SCE_HJ_DEFAULT || style > SCE_HJ_COMMENTDOC)
 				// includes SCE_HJ_COMMENT & SCE_HJ_COMMENTLINE
 				break;
@@ -1226,8 +1286,7 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 			case eScriptPHP:
 				//not currently supported				case eScriptVBS:
 
-				if (!(state == SCE_HPHP_COMMENT || state == SCE_HPHP_COMMENTLINE) &&
-				    !(state == SCE_HJ_REGEX || state == SCE_HJ_COMMENT || state == SCE_HJ_COMMENTLINE || state == SCE_HJ_COMMENTDOC) &&
+				if (!AnyOf(state, SCE_HPHP_COMMENT, SCE_HPHP_COMMENTLINE, SCE_HJ_REGEX, SCE_HJ_COMMENT, SCE_HJ_COMMENTLINE, SCE_HJ_COMMENTDOC) &&
 				    !isStringState(state)) {
 				//Platform::DebugPrintf("state=%d, StateToPrint=%d, initStyle=%d\n", state, StateToPrint, initStyle);
 				//if ((state == SCE_HPHP_OPERATOR) || (state == SCE_HPHP_DEFAULT) || (state == SCE_HJ_SYMBOLS) || (state == SCE_HJ_START) || (state == SCE_HJ_DEFAULT)) {
@@ -1254,11 +1313,12 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 						levelCurrent++;
 					} else if ((ch == '\n') && !((chNext == '\r') && (chNext2 == '\n')) && (chNext != '\n')) {
 						// check if the number of tabs is lower than the level
-						int Findlevel = (levelCurrent & ~SC_FOLDLEVELBASE) * 8;
+						constexpr int tabWidth = 8;
+						int Findlevel = (levelCurrent & ~SC_FOLDLEVELBASE) * tabWidth;
 						for (Sci_Position j = 0; Findlevel > 0; j++) {
 							const char chTmp = styler.SafeGetCharAt(i + j + 1);
 							if (chTmp == '\t') {
-								Findlevel -= 8;
+								Findlevel -= tabWidth;
 							} else if (chTmp == ' ') {
 								Findlevel--;
 							} else {
@@ -1267,8 +1327,8 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 						}
 
 						if (Findlevel > 0) {
-							levelCurrent -= Findlevel / 8;
-							if (Findlevel % 8)
+							levelCurrent -= Findlevel / tabWidth;
+							if (Findlevel % tabWidth)
 								levelCurrent--;
 						}
 					}
@@ -1431,9 +1491,9 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 			else if (ch == '$')
 				makoBlockType = "{";
 			else if (chNext == '/')
-				makoBlockType = GetNextWord(styler, i+3);
+				makoBlockType = GetNextWord(styler, i+3);	// Tag end: </%tag>
 			else
-				makoBlockType = GetNextWord(styler, i+2);
+				makoBlockType = GetNextWord(styler, i+2);	// Tag: <%tag...>
 			styler.ColourTo(i - 1, StateToPrint);
 			beforePreProc = state;
 			if (inScriptType == eNonHtmlScript)
@@ -1454,7 +1514,7 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 			if (ch != '%' && ch != '$' && ch != '/') {
 				i += makoBlockType.length();
 				visibleChars += makoBlockType.length();
-				if (keywords4.InList(makoBlockType.c_str()))
+				if (keywords4.InList(makoBlockType))
 					styler.ColourTo(i, SCE_HP_WORD);
 				else
 					styler.ColourTo(i, SCE_H_TAGUNKNOWN);
@@ -1572,6 +1632,18 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 				state = SCE_H_COMMENT; // wait for a pending command
 				styler.ColourTo(i + 2, SCE_H_COMMENT);
 				i += 2; // follow styling after the --
+				if (!isXml) {
+					// handle empty comment: <!-->, <!--->
+					// https://html.spec.whatwg.org/multipage/parsing.html#parse-error-abrupt-closing-of-empty-comment
+					chNext = SafeGetUnsignedCharAt(styler, i + 1);
+					if ((chNext == '>') || (chNext == '-' && SafeGetUnsignedCharAt(styler, i + 2) == '>')) {
+						if (chNext == '-') {
+							i += 1;
+						}
+						chPrev = '-';
+						ch = '-';
+					}
+				}
 			} else if (isWordCdata(i + 1, i + 7, styler)) {
 				state = SCE_H_CDATA;
 			} else {
@@ -1595,15 +1667,14 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 				                                    styler.GetStartSegment(), i - 1, aspScript);
 			}
 			if (state == SCE_HP_WORD) {
-				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType, isMako);
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, classifierPython, styler, prevWord, inScriptType, isMako);
 			} else {
 				styler.ColourTo(i - 1, StateToPrint);
 			}
 			if ((makoBlockType != "%") && (makoBlockType != "{") && ch != '>') {
 				i++;
 				visibleChars++;
-		    }
-			else if ((makoBlockType == "%") && ch == '/') {
+			} else if ((makoBlockType == "%") && ch == '/') {
 				i++;
 				visibleChars++;
 			}
@@ -1629,7 +1700,7 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 				                                    styler.GetStartSegment(), i - 1, aspScript);
 			}
 			if (state == SCE_HP_WORD) {
-				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType, isMako);
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, classifierPython, styler, prevWord, inScriptType, isMako);
 			} else {
 				styler.ColourTo(i - 1, StateToPrint);
 			}
@@ -1657,16 +1728,16 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 			// Bounce out of any ASP mode
 			switch (state) {
 			case SCE_HJ_WORD:
-				classifyWordHTJS(styler.GetStartSegment(), i - 1, keywords2, styler, inScriptType);
+				classifyWordHTJS(styler.GetStartSegment(), i - 1, keywords2, classifierJavaScript, classifierJavaScriptServer, styler, inScriptType);
 				break;
 			case SCE_HB_WORD:
-				classifyWordHTVB(styler.GetStartSegment(), i - 1, keywords3, styler, inScriptType);
+				classifyWordHTVB(styler.GetStartSegment(), i - 1, keywords3, classifierBasic, styler, inScriptType);
 				break;
 			case SCE_HP_WORD:
-				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType, isMako);
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, classifierPython, styler, prevWord, inScriptType, isMako);
 				break;
 			case SCE_HPHP_WORD:
-				classifyWordHTPHP(styler.GetStartSegment(), i - 1, keywords5, styler);
+				classifyWordHTPHP(styler.GetStartSegment(), i - 1, keywords5, classifierPHP, styler);
 				break;
 			case SCE_H_XCCOMMENT:
 				styler.ColourTo(i - 1, state);
@@ -1707,7 +1778,7 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 				// in HTML, fold on tag open and unfold on tag close
 				tagOpened = true;
 				tagClosing = (chNext == '/');
-				if (foldXmlAtTagOpen && !(chNext == '/' || chNext == '?' || chNext == '!' || chNext == '-' || chNext == '%')) {
+				if (foldXmlAtTagOpen && !AnyOf(chNext, '/', '?', '!', '-', '%')) {
 					levelCurrent++;
 				}
 				if (foldXmlAtTagOpen && chNext == '/') {
@@ -1843,7 +1914,12 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 			}
 			break;
 		case SCE_H_COMMENT:
-			if ((scriptLanguage != eScriptComment) && (chPrev2 == '-') && (chPrev == '-') && (ch == '>')) {
+			if ((scriptLanguage != eScriptComment) && (chPrev2 == '-') && (chPrev == '-') && (ch == '>' || (!isXml && ch == '!' && chNext == '>'))) {
+				// close HTML comment with --!>
+				// https://html.spec.whatwg.org/multipage/parsing.html#parse-error-incorrectly-closed-comment
+				if (ch == '!') {
+					i += 1;
+				}
 				styler.ColourTo(i, StateToPrint);
 				state = SCE_H_DEFAULT;
 				levelCurrent--;
@@ -1892,7 +1968,7 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 		case SCE_H_TAGUNKNOWN:
 			if (!setTagContinue.Contains(ch) && !((ch == '/') && (chPrev == '<'))) {
 				int eClass = classifyTagHTML(styler.GetStartSegment(),
-					i - 1, keywords, styler, tagDontFold, caseSensitive, isXml, allowScripts, nonFoldingTags);
+					i - 1, keywords, classifierTags, styler, tagDontFold, caseSensitive, isXml, allowScripts, nonFoldingTags, lastTag);
 				if (eClass == SCE_H_SCRIPT || eClass == SCE_H_COMMENT) {
 					if (!tagClosing) {
 						inScriptType = eNonHtmlScript;
@@ -1946,7 +2022,7 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 			break;
 		case SCE_H_ATTRIBUTE:
 			if (!setAttributeContinue.Contains(ch)) {
-				isLanguageType = classifyAttribHTML(inScriptType, styler.GetStartSegment(), i - 1, keywords, styler);
+				isLanguageType = classifyAttribHTML(inScriptType, styler.GetStartSegment(), i - 1, keywords, classifierAttributes, styler, lastTag);
 				if (ch == '>') {
 					styler.ColourTo(i, SCE_H_TAG);
 					if (inScriptType == eNonHtmlScript) {
@@ -2125,7 +2201,8 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 			break;
 		case SCE_HJ_WORD:
 			if (!IsAWordChar(ch)) {
-				classifyWordHTJS(styler.GetStartSegment(), i - 1, keywords2, styler, inScriptType);
+				classifyWordHTJS(styler.GetStartSegment(), i - 1, keywords2,
+					classifierJavaScript, classifierJavaScriptServer, styler, inScriptType);
 				//styler.ColourTo(i - 1, eHTJSKeyword);
 				state = SCE_HJ_DEFAULT;
 				if (ch == '/' && chNext == '*') {
@@ -2251,7 +2328,7 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 			break;
 		case SCE_HB_WORD:
 			if (!IsAWordChar(ch)) {
-				state = classifyWordHTVB(styler.GetStartSegment(), i - 1, keywords3, styler, inScriptType);
+				state = classifyWordHTVB(styler.GetStartSegment(), i - 1, keywords3, classifierBasic, styler, inScriptType);
 				if (state == SCE_HB_DEFAULT) {
 					if (ch == '\"') {
 						state = SCE_HB_STRING;
@@ -2335,7 +2412,7 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 			break;
 		case SCE_HP_WORD:
 			if (!IsAWordChar(ch)) {
-				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, styler, prevWord, inScriptType, isMako);
+				classifyWordHTPy(styler.GetStartSegment(), i - 1, keywords4, classifierPython, styler, prevWord, inScriptType, isMako);
 				state = SCE_HP_DEFAULT;
 				if (ch == '#') {
 					state = SCE_HP_COMMENTLINE;
@@ -2409,7 +2486,7 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 			///////////// start - PHP state handling
 		case SCE_HPHP_WORD:
 			if (!IsPhpWordChar(ch)) {
-				classifyWordHTPHP(styler.GetStartSegment(), i - 1, keywords5, styler);
+				classifyWordHTPHP(styler.GetStartSegment(), i - 1, keywords5, classifierPHP, styler);
 				if (ch == '/' && chNext == '*') {
 					i++;
 					state = SCE_HPHP_COMMENT;
@@ -2611,16 +2688,17 @@ void SCI_METHOD LexerHTML::Lex(Sci_PositionU startPos, Sci_Position length, int
 
 	switch (state) {
 	case SCE_HJ_WORD:
-		classifyWordHTJS(styler.GetStartSegment(), lengthDoc - 1, keywords2, styler, inScriptType);
+		classifyWordHTJS(styler.GetStartSegment(), lengthDoc - 1, keywords2,
+			classifierJavaScript, classifierJavaScriptServer, styler, inScriptType);
 		break;
 	case SCE_HB_WORD:
-		classifyWordHTVB(styler.GetStartSegment(), lengthDoc - 1, keywords3, styler, inScriptType);
+		classifyWordHTVB(styler.GetStartSegment(), lengthDoc - 1, keywords3, classifierBasic, styler, inScriptType);
 		break;
 	case SCE_HP_WORD:
-		classifyWordHTPy(styler.GetStartSegment(), lengthDoc - 1, keywords4, styler, prevWord, inScriptType, isMako);
+		classifyWordHTPy(styler.GetStartSegment(), lengthDoc - 1, keywords4, classifierPython, styler, prevWord, inScriptType, isMako);
 		break;
 	case SCE_HPHP_WORD:
-		classifyWordHTPHP(styler.GetStartSegment(), lengthDoc - 1, keywords5, styler);
+		classifyWordHTPHP(styler.GetStartSegment(), lengthDoc - 1, keywords5, classifierPHP, styler);
 		break;
 	default:
 		StateToPrint = statePrintForState(state, inScriptType);
diff --git a/src/lexilla/lexers/LexJSON.cxx b/src/lexilla/lexers/LexJSON.cxx
index 6ba428110..ad0f605e3 100644
--- a/src/lexilla/lexers/LexJSON.cxx
+++ b/src/lexilla/lexers/LexJSON.cxx
@@ -248,10 +248,7 @@ class LexerJSON : public DefaultLexer {
 		}
 		Sci_Position firstModification = -1;
 		if (wordListN) {
-			WordList wlNew;
-			wlNew.Set(wl);
-			if (*wordListN != wlNew) {
-				wordListN->Set(wl);
+			if (wordListN->Set(wl)) {
 				firstModification = 0;
 			}
 		}
diff --git a/src/lexilla/lexers/LexJulia.cxx b/src/lexilla/lexers/LexJulia.cxx
index a37e428a8..c8c597c11 100644
--- a/src/lexilla/lexers/LexJulia.cxx
+++ b/src/lexilla/lexers/LexJulia.cxx
@@ -192,10 +192,7 @@ Sci_Position SCI_METHOD LexerJulia::WordListSet(int n, const char *wl) {
 	}
 	Sci_Position firstModification = -1;
 	if (wordListN) {
-		WordList wlNew;
-		wlNew.Set(wl);
-		if (*wordListN != wlNew) {
-			wordListN->Set(wl);
+		if (wordListN->Set(wl)) {
 			firstModification = 0;
 		}
 	}
diff --git a/src/lexilla/lexers/LexLua.cxx b/src/lexilla/lexers/LexLua.cxx
index e16ac3a3d..dfb158ff9 100644
--- a/src/lexilla/lexers/LexLua.cxx
+++ b/src/lexilla/lexers/LexLua.cxx
@@ -13,13 +13,13 @@
 
 #include <string>
 #include <string_view>
+#include <vector>
 #include <map>
 
 #include "ILexer.h"
 #include "Scintilla.h"
 #include "SciLexer.h"
 
-#include "StringCopy.h"
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "Accessor.h"
@@ -27,6 +27,7 @@
 #include "CharacterSet.h"
 #include "LexerModule.h"
 #include "OptionSet.h"
+#include "SubStyles.h"
 #include "DefaultLexer.h"
 
 using namespace Scintilla;
@@ -46,7 +47,7 @@ int LongDelimCheck(StyleContext &sc) {
 	return 0;
 }
 
-const char * const luaWordListDesc[] = {
+const char *const luaWordListDesc[] = {
 	"Keywords",
 	"Basic functions",
 	"String, (table) & math functions",
@@ -55,9 +56,11 @@ const char * const luaWordListDesc[] = {
 	"user2",
 	"user3",
 	"user4",
-    nullptr
+	nullptr
 };
 
+const char styleSubable[] = { SCE_LUA_IDENTIFIER, 0 };
+
 const LexicalClass lexicalClasses[] = {
 	// Lexer Lua SCLEX_LUA SCE_LUA_:
 	0, "SCE_LUA_DEFAULT", "default", "White space: Visible only in View Whitespace mode (or if it has a back colour)",
@@ -107,9 +110,10 @@ class LexerLua : public DefaultLexer {
 	WordList keywords8;
 	OptionsLua options;
 	OptionSetLua osLua;
+	SubStyles subStyles{styleSubable};
 public:
 	explicit LexerLua() :
-		DefaultLexer("lua", SCLEX_LUA, lexicalClasses, ELEMENTS(lexicalClasses)) {
+		DefaultLexer("lua", SCLEX_LUA, lexicalClasses, std::size(lexicalClasses)) {
 	}
 	~LexerLua() override = default;
 	void SCI_METHOD Release() noexcept override {
@@ -138,6 +142,35 @@ class LexerLua : public DefaultLexer {
 	void SCI_METHOD Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
 	void SCI_METHOD Fold(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) override;
 
+	int SCI_METHOD AllocateSubStyles(int styleBase, int numberStyles) override {
+		return subStyles.Allocate(styleBase, numberStyles);
+	}
+	int SCI_METHOD SubStylesStart(int styleBase) override {
+		return subStyles.Start(styleBase);
+	}
+	int SCI_METHOD SubStylesLength(int styleBase) override {
+		return subStyles.Length(styleBase);
+	}
+	int SCI_METHOD StyleFromSubStyle(int subStyle) override {
+		const int styleBase = subStyles.BaseStyle(subStyle);
+		return styleBase;
+	}
+	int SCI_METHOD PrimaryStyleFromStyle(int style) override {
+		return style;
+	}
+	void SCI_METHOD FreeSubStyles() override {
+		subStyles.Free();
+	}
+	void SCI_METHOD SetIdentifiers(int style, const char *identifiers) override {
+		subStyles.SetIdentifiers(style, identifiers);
+	}
+	int SCI_METHOD DistanceToSecondaryStyles() override {
+		return 0;
+	}
+	const char *SCI_METHOD GetSubStyleBases() override {
+		return styleSubable;
+	}
+
 	static ILexer5 *LexerFactoryLua() {
 		return new LexerLua();
 	}
@@ -206,6 +239,8 @@ void LexerLua::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, I
 	const CharacterSet setLuaOperator("*/-+()={}~[];<>,.^%:#&|");
 	const CharacterSet setEscapeSkip("\"'\\");
 
+	const WordClassifier &classifierIdentifiers = subStyles.Classifier(SCE_LUA_IDENTIFIER);
+
 	Sci_Position currentLine = styler.GetLine(startPos);
 	// Initialize long string [[ ... ]] or block comment --[[ ... ]],
 	// if we are inside such a string. Block comment was introduced in Lua 5.0,
@@ -324,7 +359,7 @@ void LexerLua::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, I
 					sc.SetState(SCE_LUA_DEFAULT);
 			}
 		} else if (sc.state == SCE_LUA_IDENTIFIER) {
-			idenPos--;			// commit already-scanned identitier/word parts
+			idenPos--;			// commit already-scanned identifier/word parts
 			if (idenWordPos > 0) {
 				idenWordPos--;
 				sc.ChangeState(idenStyle);
@@ -405,7 +440,7 @@ void LexerLua::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, I
 		if (sc.state == SCE_LUA_DEFAULT) {
 			if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) {
 				sc.SetState(SCE_LUA_NUMBER);
-				if (sc.ch == '0' && toupper(sc.chNext) == 'X') {
+				if (sc.ch == '0' && AnyOf(sc.chNext, 'x', 'X')) {
 					sc.Forward();
 				}
 			} else if (setWordStart.Contains(sc.ch)) {
@@ -450,6 +485,11 @@ void LexerLua::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, I
 						newStyle = SCE_LUA_WORD7;
 					} else if (keywords8.InList(ident)) {
 						newStyle = SCE_LUA_WORD8;
+					} else {
+						const int subStyle = classifierIdentifiers.ValueFor(ident);
+						if (subStyle >= 0) {
+							newStyle = subStyle;
+						}
 					}
 					if (newStyle != SCE_LUA_IDENTIFIER) {
 						idenStyle = newStyle;
@@ -465,7 +505,7 @@ void LexerLua::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, I
 						cNext = 0;
 					}
 				} while (cNext);
-                if ((idenStyle == SCE_LUA_WORD) && (ident == "goto")) {
+				if ((idenStyle == SCE_LUA_WORD) && (ident == "goto")) {
 					foundGoto = true;
 				}
 				sc.SetState(SCE_LUA_IDENTIFIER);
diff --git a/src/lexilla/lexers/LexPerl.cxx b/src/lexilla/lexers/LexPerl.cxx
index 4d29a19d0..b709933b2 100644
--- a/src/lexilla/lexers/LexPerl.cxx
+++ b/src/lexilla/lexers/LexPerl.cxx
@@ -538,10 +538,7 @@ Sci_Position SCI_METHOD LexerPerl::WordListSet(int n, const char *wl) {
 	}
 	Sci_Position firstModification = -1;
 	if (wordListN) {
-		WordList wlNew;
-		wlNew.Set(wl);
-		if (*wordListN != wlNew) {
-			wordListN->Set(wl);
+		if (wordListN->Set(wl)) {
 			firstModification = 0;
 		}
 	}
diff --git a/src/lexilla/lexers/LexProps.cxx b/src/lexilla/lexers/LexProps.cxx
index 700a0ab51..bddb2ad5e 100644
--- a/src/lexilla/lexers/LexProps.cxx
+++ b/src/lexilla/lexers/LexProps.cxx
@@ -5,12 +5,8 @@
 // Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cassert>
 
 #include <string>
 #include <string_view>
@@ -28,22 +24,24 @@
 
 using namespace Lexilla;
 
-static inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
+namespace {
+
+bool AtEOL(Accessor &styler, Sci_PositionU i) {
 	return (styler[i] == '\n') ||
 	       ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
 }
 
-static inline bool isassignchar(unsigned char ch) {
+constexpr bool isAssignChar(char ch) noexcept {
 	return (ch == '=') || (ch == ':');
 }
 
-static void ColourisePropsLine(
+void ColourisePropsLine(
 	const char *lineBuffer,
-    Sci_PositionU lengthLine,
-    Sci_PositionU startLine,
-    Sci_PositionU endPos,
-    Accessor &styler,
-    bool allowInitialSpaces) {
+	Sci_PositionU lengthLine,
+	Sci_PositionU startLine,
+	Sci_PositionU endPos,
+	Accessor &styler,
+	bool allowInitialSpaces) {
 
 	Sci_PositionU i = 0;
 	if (allowInitialSpaces) {
@@ -61,14 +59,14 @@ static void ColourisePropsLine(
 			styler.ColourTo(endPos, SCE_PROPS_SECTION);
 		} else if (lineBuffer[i] == '@') {
 			styler.ColourTo(startLine + i, SCE_PROPS_DEFVAL);
-			if (isassignchar(lineBuffer[i++]))
+			if (isAssignChar(lineBuffer[i++]))
 				styler.ColourTo(startLine + i, SCE_PROPS_ASSIGNMENT);
 			styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
 		} else {
 			// Search for the '=' character
-			while ((i < lengthLine) && !isassignchar(lineBuffer[i]))
+			while ((i < lengthLine) && !isAssignChar(lineBuffer[i]))
 				i++;
-			if ((i < lengthLine) && isassignchar(lineBuffer[i])) {
+			if ((i < lengthLine) && isAssignChar(lineBuffer[i])) {
 				styler.ColourTo(startLine + i - 1, SCE_PROPS_KEY);
 				styler.ColourTo(startLine + i, SCE_PROPS_ASSIGNMENT);
 				styler.ColourTo(endPos, SCE_PROPS_DEFAULT);
@@ -81,7 +79,7 @@ static void ColourisePropsLine(
 	}
 }
 
-static void ColourisePropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+void ColourisePropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
 	std::string lineBuffer;
 	styler.StartAt(startPos);
 	styler.StartSegment(startPos);
@@ -109,7 +107,7 @@ static void ColourisePropsDoc(Sci_PositionU startPos, Sci_Position length, int,
 
 // adaption by ksc, using the "} else {" trick of 1.53
 // 030721
-static void FoldPropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+void FoldPropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
 	const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
 
 	const Sci_PositionU endPos = startPos + length;
@@ -117,7 +115,6 @@ static void FoldPropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordL
 	Sci_Position lineCurrent = styler.GetLine(startPos);
 
 	char chNext = styler[startPos];
-	int styleNext = styler.StyleAt(startPos);
 	bool headerPoint = false;
 	int levelPrevious = (lineCurrent > 0) ? styler.LevelAt(lineCurrent - 1) : SC_FOLDLEVELBASE;
 
@@ -125,8 +122,7 @@ static void FoldPropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordL
 		const char ch = chNext;
 		chNext = styler[i+1];
 
-		const int style = styleNext;
-		styleNext = styler.StyleAt(i + 1);
+		const int style = styler.StyleIndexAt(i);
 		const bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
 
 		if (style == SCE_PROPS_SECTION) {
@@ -164,12 +160,14 @@ static void FoldPropsDoc(Sci_PositionU startPos, Sci_Position length, int, WordL
 	if (levelPrevious & SC_FOLDLEVELHEADERFLAG) {
 		level += 1;
 	}
-	int flagsNext = styler.LevelAt(lineCurrent);
+	const int flagsNext = styler.LevelAt(lineCurrent);
 	styler.SetLevel(lineCurrent, level | (flagsNext & ~SC_FOLDLEVELNUMBERMASK));
 }
 
-static const char *const emptyWordListDesc[] = {
-	0
+const char *const emptyWordListDesc[] = {
+	nullptr
 };
 
+}
+
 LexerModule lmProps(SCLEX_PROPERTIES, ColourisePropsDoc, "props", FoldPropsDoc, emptyWordListDesc);
diff --git a/src/lexilla/lexers/LexPython.cxx b/src/lexilla/lexers/LexPython.cxx
index 6f29a39f3..efb2e4fba 100644
--- a/src/lexilla/lexers/LexPython.cxx
+++ b/src/lexilla/lexers/LexPython.cxx
@@ -20,7 +20,6 @@
 #include "Scintilla.h"
 #include "SciLexer.h"
 
-#include "StringCopy.h"
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "Accessor.h"
@@ -87,6 +86,9 @@ constexpr bool IsRawPrefix(int ch) {
 }
 
 bool IsPyStringStart(int ch, int chNext, int chNext2, literalsAllowed allowed) noexcept {
+	// To cover both python2 and python3 lex character prefixes as --
+	// ur'' is a string, but ru'' is not
+	// fr'', rf'', br'', rb'' are all strings
 	if (IsQuote(ch))
 		return true;
 	if (IsPyStringTypeChar(ch, allowed)) {
@@ -95,40 +97,39 @@ bool IsPyStringStart(int ch, int chNext, int chNext2, literalsAllowed allowed) n
 		if (IsRawPrefix(chNext) && IsQuote(chNext2))
 			return true;
 	}
-	if (IsRawPrefix(ch) && IsQuote(chNext))
-		return true;
+	if (IsRawPrefix(ch)) {
+		if (IsQuote(chNext))
+			return true;
+		if (IsPyStringTypeChar(chNext, allowed) && !AnyOf(chNext, 'u', 'U') && IsQuote(chNext2))
+			return true;
+	}
 
 	return false;
 }
 
 constexpr bool IsPyFStringState(int st) noexcept {
-	return ((st == SCE_P_FCHARACTER) || (st == SCE_P_FSTRING) ||
-		(st == SCE_P_FTRIPLE) || (st == SCE_P_FTRIPLEDOUBLE));
+	return AnyOf(st, SCE_P_FCHARACTER, SCE_P_FSTRING, SCE_P_FTRIPLE, SCE_P_FTRIPLEDOUBLE);
 }
 
 constexpr bool IsPySingleQuoteStringState(int st) noexcept {
-	return ((st == SCE_P_CHARACTER) || (st == SCE_P_STRING) ||
-		(st == SCE_P_FCHARACTER) || (st == SCE_P_FSTRING));
+	return AnyOf(st, SCE_P_CHARACTER, SCE_P_STRING, SCE_P_FCHARACTER, SCE_P_FSTRING);
 }
 
 constexpr bool IsPyTripleQuoteStringState(int st) noexcept {
-	return ((st == SCE_P_TRIPLE) || (st == SCE_P_TRIPLEDOUBLE) ||
-		(st == SCE_P_FTRIPLE) || (st == SCE_P_FTRIPLEDOUBLE));
+	return AnyOf(st, SCE_P_TRIPLE, SCE_P_TRIPLEDOUBLE, SCE_P_FTRIPLE, SCE_P_FTRIPLEDOUBLE);
 }
 
 char GetPyStringQuoteChar(int st) noexcept {
-	if ((st == SCE_P_CHARACTER) || (st == SCE_P_FCHARACTER) ||
-			(st == SCE_P_TRIPLE) || (st == SCE_P_FTRIPLE))
+	if (AnyOf(st, SCE_P_CHARACTER, SCE_P_FCHARACTER, SCE_P_TRIPLE, SCE_P_FTRIPLE))
 		return '\'';
-	if ((st == SCE_P_STRING) || (st == SCE_P_FSTRING) ||
-			(st == SCE_P_TRIPLEDOUBLE) || (st == SCE_P_FTRIPLEDOUBLE))
+	if (AnyOf(st, SCE_P_STRING, SCE_P_FSTRING, SCE_P_TRIPLEDOUBLE, SCE_P_FTRIPLEDOUBLE))
 		return '"';
 
 	return '\0';
 }
 
 void PushStateToStack(int state, std::vector<SingleFStringExpState> &stack, SingleFStringExpState *&currentFStringExp) {
-	SingleFStringExpState single = {state, 0};
+	const SingleFStringExpState single = {state, 0};
 	stack.push_back(single);
 
 	currentFStringExp = &stack.back();
@@ -155,14 +156,22 @@ int PopFromStateStack(std::vector<SingleFStringExpState> &stack, SingleFStringEx
 int GetPyStringState(Accessor &styler, Sci_Position i, Sci_PositionU *nextIndex, literalsAllowed allowed) {
 	char ch = styler.SafeGetCharAt(i);
 	char chNext = styler.SafeGetCharAt(i + 1);
-	const int firstIsF = (ch == 'f' || ch == 'F');
+	bool isFString = false;
 
-	// Advance beyond r, u, or ur prefix (or r, b, or br in Python 2.7+ and r, f, or fr in Python 3.6+), but bail if there are any unexpected chars
+	// Advance beyond r, a type char, or both (in either order)
+	// Note that this depends on IsPyStringStart to enforce ru'' not being a string
 	if (IsRawPrefix(ch)) {
 		i++;
+		if (IsPyStringTypeChar(chNext, allowed)) {
+			if (AnyOf(chNext, 'f', 'F'))
+				isFString = true;
+			i++;
+		}
 		ch = styler.SafeGetCharAt(i);
 		chNext = styler.SafeGetCharAt(i + 1);
 	} else if (IsPyStringTypeChar(ch, allowed)) {
+		if (AnyOf(ch, 'f', 'F'))
+			isFString = true;
 		if (IsRawPrefix(chNext))
 			i += 2;
 		else
@@ -171,6 +180,7 @@ int GetPyStringState(Accessor &styler, Sci_Position i, Sci_PositionU *nextIndex,
 		chNext = styler.SafeGetCharAt(i + 1);
 	}
 
+	// ch and i will be the first quote
 	if (!IsQuote(ch)) {
 		*nextIndex = i + 1;
 		return SCE_P_DEFAULT;
@@ -180,20 +190,20 @@ int GetPyStringState(Accessor &styler, Sci_Position i, Sci_PositionU *nextIndex,
 		*nextIndex = i + 3;
 
 		if (ch == '"')
-			return (firstIsF ? SCE_P_FTRIPLEDOUBLE : SCE_P_TRIPLEDOUBLE);
+			return (isFString ? SCE_P_FTRIPLEDOUBLE : SCE_P_TRIPLEDOUBLE);
 		else
-			return (firstIsF ? SCE_P_FTRIPLE : SCE_P_TRIPLE);
+			return (isFString ? SCE_P_FTRIPLE : SCE_P_TRIPLE);
 	} else {
 		*nextIndex = i + 1;
 
 		if (ch == '"')
-			return (firstIsF ? SCE_P_FSTRING : SCE_P_STRING);
+			return (isFString ? SCE_P_FSTRING : SCE_P_STRING);
 		else
-			return (firstIsF ? SCE_P_FCHARACTER : SCE_P_CHARACTER);
+			return (isFString ? SCE_P_FCHARACTER : SCE_P_CHARACTER);
 	}
 }
 
-bool IsAWordChar(int ch, bool unicodeIdentifiers) {
+bool IsAWordChar(int ch, bool unicodeIdentifiers) noexcept {
 	if (IsASCII(ch))
 		return (IsAlphaNumeric(ch) || ch == '.' || ch == '_');
 
@@ -204,7 +214,7 @@ bool IsAWordChar(int ch, bool unicodeIdentifiers) {
 	return IsXidContinue(ch);
 }
 
-bool IsAWordStart(int ch, bool unicodeIdentifiers) {
+bool IsAWordStart(int ch, bool unicodeIdentifiers) noexcept {
 	if (IsASCII(ch))
 		return (IsUpperOrLowerCase(ch) || ch == '_');
 
@@ -362,7 +372,7 @@ struct OptionSetPython : public OptionSet<OptionsPython> {
 
 const char styleSubable[] = { SCE_P_IDENTIFIER, 0 };
 
-LexicalClass lexicalClasses[] = {
+const LexicalClass lexicalClasses[] = {
 	// Lexer Python SCLEX_PYTHON SCE_P_:
 	0, "SCE_P_DEFAULT", "default", "White space",
 	1, "SCE_P_COMMENTLINE", "comment line", "Comment",
@@ -387,20 +397,17 @@ LexicalClass lexicalClasses[] = {
 	20, "SCE_P_ATTRIBUTE", "identifier", "Attribute of identifier",
 };
 
-}
-
 class LexerPython : public DefaultLexer {
 	WordList keywords;
 	WordList keywords2;
 	OptionsPython options;
 	OptionSetPython osPython;
 	enum { ssIdentifier };
-	SubStyles subStyles;
+	SubStyles subStyles{styleSubable};
 	std::map<Sci_Position, std::vector<SingleFStringExpState> > ftripleStateAtEol;
 public:
 	explicit LexerPython() :
-		DefaultLexer("python", SCLEX_PYTHON, lexicalClasses, ELEMENTS(lexicalClasses)),
-		subStyles(styleSubable, 0x80, 0x40, 0) {
+		DefaultLexer("python", SCLEX_PYTHON, lexicalClasses, std::size(lexicalClasses)) {
 	}
 	~LexerPython() override = default;
 	void SCI_METHOD Release() override {
@@ -419,7 +426,7 @@ class LexerPython : public DefaultLexer {
 		return osPython.DescribeProperty(name);
 	}
 	Sci_Position SCI_METHOD PropertySet(const char *key, const char *val) override;
-	const char * SCI_METHOD PropertyGet(const char *key) override {
+	const char *SCI_METHOD PropertyGet(const char *key) override {
 		return osPython.PropertyGet(key);
 	}
 	const char *SCI_METHOD DescribeWordListSets() override {
@@ -568,10 +575,8 @@ void SCI_METHOD LexerPython::Lex(Sci_PositionU startPos, Sci_Position length, in
 			// Look for backslash-continued lines
 			while (lineCurrent > 0) {
 				const Sci_Position eolPos = styler.LineStart(lineCurrent) - 1;
-				const int eolStyle = styler.StyleAt(eolPos);
-				if (eolStyle == SCE_P_STRING
-						|| eolStyle == SCE_P_CHARACTER
-						|| eolStyle == SCE_P_STRINGEOL) {
+				const int eolStyle = styler.StyleIndexAt(eolPos);
+				if (AnyOf(eolStyle, SCE_P_STRING, SCE_P_CHARACTER, SCE_P_STRINGEOL)) {
 					lineCurrent -= 1;
 				} else {
 					break;
@@ -579,7 +584,7 @@ void SCI_METHOD LexerPython::Lex(Sci_PositionU startPos, Sci_Position length, in
 			}
 			startPos = styler.LineStart(lineCurrent);
 		}
-		initStyle = startPos == 0 ? SCE_P_DEFAULT : styler.StyleAt(startPos - 1);
+		initStyle = startPos == 0 ? SCE_P_DEFAULT : styler.StyleIndexAt(startPos - 1);
 	}
 
 	const literalsAllowed allowedLiterals = options.AllowedLiterals();
@@ -653,12 +658,12 @@ void SCI_METHOD LexerPython::Lex(Sci_PositionU startPos, Sci_Position length, in
 			}
 		} else if (sc.state == SCE_P_IDENTIFIER) {
 			if ((sc.ch == '.') || (!IsAWordChar(sc.ch, options.unicodeIdentifiers))) {
-				char s[100];
-				sc.GetCurrent(s, sizeof(s));
+				char identifier[100];
+				sc.GetCurrent(identifier, sizeof(identifier));
 				int style = SCE_P_IDENTIFIER;
-				if ((kwLast == kwImport) && (strcmp(s, "as") == 0)) {
+				if ((kwLast == kwImport) && (strcmp(identifier, "as") == 0)) {
 					style = SCE_P_WORD;
-				} else if (keywords.InList(s) && !IsMatchOrCaseIdentifier(sc, styler, s)) {
+				} else if (keywords.InList(identifier) && !IsMatchOrCaseIdentifier(sc, styler, identifier)) {
 					style = SCE_P_WORD;
 				} else if (kwLast == kwClass) {
 					style = SCE_P_CLASSNAME;
@@ -681,7 +686,7 @@ void SCI_METHOD LexerPython::Lex(Sci_PositionU startPos, Sci_Position length, in
 							break;
 						}
 					}
-				} else if (keywords2.InList(s)) {
+				} else if (keywords2.InList(identifier)) {
 					if (options.keywords2NoSubIdentifiers) {
 						// We don't want to highlight keywords2
 						// that are used as a sub-identifier,
@@ -693,7 +698,7 @@ void SCI_METHOD LexerPython::Lex(Sci_PositionU startPos, Sci_Position length, in
 						style = SCE_P_WORD2;
 					}
 				} else {
-					const int subStyle = classifierIdentifiers.ValueFor(s);
+					const int subStyle = classifierIdentifiers.ValueFor(identifier);
 					if (subStyle >= 0) {
 						style = subStyle;
 					}
@@ -724,11 +729,11 @@ void SCI_METHOD LexerPython::Lex(Sci_PositionU startPos, Sci_Position length, in
 								if (!IsASpaceOrTab(ch))
 									break;
 							}
-							if (((isDecoratorAttribute) && (!isComment)) && (((options.decoratorAttributes == 1)  && (style == SCE_P_IDENTIFIER)) || (options.decoratorAttributes == 2))){
+							if (((isDecoratorAttribute) && (!isComment)) && (((options.decoratorAttributes == 1)  && (style == SCE_P_IDENTIFIER)) || (options.decoratorAttributes == 2))) {
 								// Style decorator attributes as decorators but respect already styled identifiers (unless requested to ignore already styled identifiers)
 								style = SCE_P_DECORATOR;
 							}
-							if (((!isDecoratorAttribute) && (!isComment)) && (((options.identifierAttributes == 1) && (style == SCE_P_IDENTIFIER)) || (options.identifierAttributes == 2))){
+							if (((!isDecoratorAttribute) && (!isComment)) && (((options.identifierAttributes == 1) && (style == SCE_P_IDENTIFIER)) || (options.identifierAttributes == 2))) {
 								// Style attributes and ignore decorator attributes but respect already styled identifiers (unless requested to ignore already styled identifiers)
 								style = SCE_P_ATTRIBUTE;
 							}
@@ -738,17 +743,17 @@ void SCI_METHOD LexerPython::Lex(Sci_PositionU startPos, Sci_Position length, in
 				sc.ChangeState(style);
 				sc.SetState(SCE_P_DEFAULT);
 				if (style == SCE_P_WORD) {
-					if (0 == strcmp(s, "class"))
+					if (0 == strcmp(identifier, "class"))
 						kwLast = kwClass;
-					else if (0 == strcmp(s, "def"))
+					else if (0 == strcmp(identifier, "def"))
 						kwLast = kwDef;
-					else if (0 == strcmp(s, "import"))
+					else if (0 == strcmp(identifier, "import"))
 						kwLast = kwImport;
-					else if (0 == strcmp(s, "cdef"))
+					else if (0 == strcmp(identifier, "cdef"))
 						kwLast = kwCDef;
-					else if (0 == strcmp(s, "cpdef"))
+					else if (0 == strcmp(identifier, "cpdef"))
 						kwLast = kwCPDef;
-					else if (0 == strcmp(s, "cimport"))
+					else if (0 == strcmp(identifier, "cimport"))
 						kwLast = kwImport;
 					else if (kwLast != kwCDef && kwLast != kwCPDef)
 						kwLast = kwOther;
@@ -812,7 +817,7 @@ void SCI_METHOD LexerPython::Lex(Sci_PositionU startPos, Sci_Position length, in
 		}
 
 		// If in an f-string expression and pre pep 701 lexing is used,
-		// check for the ending quote(s) and end f-string to handle 
+		// check for the ending quote(s) and end f-string to handle
 		// syntactically incorrect cases like f'{' and f"""{""". Post
 		// pep 701, a quote may appear in a { } field so cases like
 		// f"n = {":".join(seq)}" is valid
@@ -922,21 +927,21 @@ void SCI_METHOD LexerPython::Lex(Sci_PositionU startPos, Sci_Position length, in
 	sc.Complete();
 }
 
-static bool IsCommentLine(Sci_Position line, Accessor &styler) {
+bool IsCommentLine(Sci_Position line, Accessor &styler) {
 	const Sci_Position pos = styler.LineStart(line);
 	const Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
 	for (Sci_Position i = pos; i < eol_pos; i++) {
 		const char ch = styler[i];
 		if (ch == '#')
 			return true;
-		else if (ch != ' ' && ch != '\t')
+		if (!IsASpaceOrTab(ch))
 			return false;
 	}
 	return false;
 }
 
-static bool IsQuoteLine(Sci_Position line, const Accessor &styler) {
-	const int style = styler.StyleAt(styler.LineStart(line));
+bool IsQuoteLine(Sci_Position line, const Accessor &styler) {
+	const int style = styler.StyleIndexAt(styler.LineStart(line));
 	return IsPyTripleQuoteStringState(style);
 }
 
@@ -972,7 +977,7 @@ void SCI_METHOD LexerPython::Fold(Sci_PositionU startPos, Sci_Position length, i
 	startPos = styler.LineStart(lineCurrent);
 	int prev_state = SCE_P_DEFAULT;
 	if (lineCurrent >= 1)
-		prev_state = styler.StyleAt(startPos - 1);
+		prev_state = styler.StyleIndexAt(startPos - 1);
 	int prevQuote = options.foldQuotes && IsPyTripleQuoteStringState(prev_state);
 
 	// Process all characters to end of requested range or end of any triple quote
@@ -989,7 +994,7 @@ void SCI_METHOD LexerPython::Fold(Sci_PositionU startPos, Sci_Position length, i
 			// Information about next line is only available if not at end of document
 			indentNext = styler.IndentAmount(lineNext, &spaceFlags, nullptr);
 			const Sci_Position lookAtPos = (styler.LineStart(lineNext) == styler.Length()) ? styler.Length() - 1 : styler.LineStart(lineNext);
-			const int style = styler.StyleAt(lookAtPos);
+			const int style = styler.StyleIndexAt(lookAtPos);
 			quote = options.foldQuotes && IsPyTripleQuoteStringState(style);
 		}
 		const bool quote_start = (quote && !prevQuote);
@@ -1079,5 +1084,7 @@ void SCI_METHOD LexerPython::Fold(Sci_PositionU startPos, Sci_Position length, i
 	//styler.SetLevel(lineCurrent, indentCurrent);
 }
 
+}
+
 LexerModule lmPython(SCLEX_PYTHON, LexerPython::LexerFactoryPython, "python",
 		     pythonWordListDesc);
diff --git a/src/lexilla/lexers/LexRaku.cxx b/src/lexilla/lexers/LexRaku.cxx
index 8284ebcaa..a9400419b 100644
--- a/src/lexilla/lexers/LexRaku.cxx
+++ b/src/lexilla/lexers/LexRaku.cxx
@@ -848,10 +848,7 @@ Sci_Position SCI_METHOD LexerRaku::WordListSet(int n, const char *wl) {
 	}
 	Sci_Position firstModification = -1;
 	if (wordListN) {
-		WordList wlNew;
-		wlNew.Set(wl);
-		if (*wordListN != wlNew) {
-			wordListN->Set(wl);
+		if (wordListN->Set(wl)) {
 			firstModification = 0;
 		}
 	}
diff --git a/src/lexilla/lexers/LexRuby.cxx b/src/lexilla/lexers/LexRuby.cxx
index 77c97f80e..fda7450ef 100644
--- a/src/lexilla/lexers/LexRuby.cxx
+++ b/src/lexilla/lexers/LexRuby.cxx
@@ -48,6 +48,10 @@ inline bool isSafeAlpha(char ch) noexcept {
     return (isSafeASCII(ch) && isalpha(ch)) || ch == '_';
 }
 
+inline bool isSafeAlphaOrHigh(char ch) noexcept {
+	return isHighBitChar(ch) || isalpha(ch) || ch == '_';
+}
+
 inline bool isSafeAlnum(char ch) noexcept {
     return (isSafeASCII(ch) && isalnum(ch)) || ch == '_';
 }
@@ -155,7 +159,7 @@ int ClassifyWordRb(Sci_PositionU start, Sci_PositionU end, char ch, WordList &ke
             // 1. <<if test ...>> : normal
             // 2. <<stmt if test>> : demoted
             // 3. <<lhs = if ...>> : normal: start a new indent level
-            // 4. <<obj.if = 10>> : color as identifer, since it follows '.'
+            // 4. <<obj.if = 10>> : color as identifier, since it follows '.'
 
             chAttr = SCE_RB_WORD_DEMOTED;
         } else {
@@ -613,7 +617,7 @@ bool sureThisIsNotHeredoc(Sci_Position lt2StartPos, Accessor &styler) {
         j += 1;
     }
 
-    if (isSafeAlnum(styler[j])) {
+    if (isSafeAlnumOrHigh(styler[j])) {
         // Init target_end because some compilers think it won't
         // be initialized by the time it's used
         target_start = target_end = j;
@@ -622,7 +626,7 @@ bool sureThisIsNotHeredoc(Sci_Position lt2StartPos, Accessor &styler) {
         return definitely_not_a_here_doc;
     }
     for (; j < lengthDoc; j++) {
-        if (!isSafeAlnum(styler[j])) {
+        if (!isSafeAlnumOrHigh(styler[j])) {
             if (target_quote && styler[j] != target_quote) {
                 // unquoted end
                 return definitely_not_a_here_doc;
@@ -641,7 +645,7 @@ bool sureThisIsNotHeredoc(Sci_Position lt2StartPos, Accessor &styler) {
                 return definitely_not_a_here_doc;
             } else {
                 const char ch = styler[j];
-                if (ch == '#' || isEOLChar(ch) || ch == '.' || ch == ',') {
+                if (ch == '#' || isEOLChar(ch) || ch == '.' || ch == ',' || IsLowerCase(ch)) {
                     // This is OK, so break and continue;
                     break;
                 } else {
@@ -747,9 +751,6 @@ void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
 
     QuoteCls Quote;
 
-    int numDots = 0;  // For numbers --
-    // Don't start lexing in the middle of a num
-
     synchronizeDocStart(startPos, length, initStyle, styler, false);
 
     bool preferRE = true;
@@ -880,8 +881,7 @@ void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
                 styler.ColourTo(i - 1, state);
                 state = SCE_RB_NUMBER;
                 is_real_number = true;
-                numDots = 0;
-            } else if (isHighBitChar(ch) || iswordstart(ch)) {
+            } else if (isSafeAlphaOrHigh(ch)) {
                 styler.ColourTo(i - 1, state);
                 state = SCE_RB_WORD;
             } else if (ch == '#') {
@@ -933,7 +933,7 @@ void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
                 // Recognize it bit by bit
                 state = SCE_RB_GLOBAL;
             } else if (ch == '/' && preferRE) {
-                // Ambigous operator
+                // Ambiguous operator
                 styler.ColourTo(i - 1, state);
                 state = SCE_RB_REGEX;
                 Quote.New();
@@ -949,7 +949,7 @@ void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
                 chNext = chNext2;
                 styler.ColourTo(i, SCE_RB_OPERATOR);
 
-                if (!(strchr("\"\'`_-~", chNext2) || isSafeAlpha(chNext2))) {
+                if (!(strchr("\"\'`_-~", chNext2) || isSafeAlphaOrHigh(chNext2))) {
                     // It's definitely not a here-doc,
                     // based on Ruby's lexer/parser in the
                     // heredoc_identifier routine.
@@ -1285,14 +1285,11 @@ void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
                     preferRE = false;
                     advance_char(i, ch, chNext, chNext2);
                 }
-            } else if (isSafeAlnumOrHigh(ch) || ch == '_') {
+            } else if (isSafeAlnumOrHigh(ch) || ch == '_' || (ch == '.' && isSafeDigit(chNext))) {
                 // Keep going
             } else if (ch == '.' && chNext == '.') {
-                ++numDots;
                 styler.ColourTo(i - 1, state);
                 redo_char(i, ch, chNext, chNext2, state); // pass by ref
-            } else if (ch == '.' && ++numDots == 1) {
-                // Keep going
             } else {
                 styler.ColourTo(i - 1, state);
                 redo_char(i, ch, chNext, chNext2, state); // pass by ref
diff --git a/src/lexilla/lexers/LexRust.cxx b/src/lexilla/lexers/LexRust.cxx
index 4ef12d498..aa72a3043 100644
--- a/src/lexilla/lexers/LexRust.cxx
+++ b/src/lexilla/lexers/LexRust.cxx
@@ -171,10 +171,7 @@ Sci_Position SCI_METHOD LexerRust::WordListSet(int n, const char *wl) {
 	Sci_Position firstModification = -1;
 	if (n < NUM_RUST_KEYWORD_LISTS) {
 		WordList *wordListN = &keywords[n];
-		WordList wlNew;
-		wlNew.Set(wl);
-		if (*wordListN != wlNew) {
-			wordListN->Set(wl);
+		if (wordListN->Set(wl)) {
 			firstModification = 0;
 		}
 	}
@@ -210,6 +207,24 @@ static void GrabString(char* s, Accessor& styler, Sci_Position start, Sci_Positi
 	s[len] = '\0';
 }
 
+static void ScanRawIdentifier(Accessor& styler, Sci_Position& pos) {
+	Sci_Position start = pos;
+	while (IsIdentifierContinue(styler.SafeGetCharAt(pos, '\0')))
+		pos++;
+
+	char s[MAX_RUST_IDENT_CHARS + 1];
+	Sci_Position len = pos - start;
+	len = len > MAX_RUST_IDENT_CHARS ? MAX_RUST_IDENT_CHARS : len;
+	GrabString(s, styler, start, len);
+	// restricted values https://doc.rust-lang.org/reference/identifiers.html#raw-identifiers
+	if (strcmp(s, "crate") != 0 && strcmp(s, "self") != 0 &&
+		strcmp(s, "super") != 0 && strcmp(s, "Self") != 0) {
+		styler.ColourTo(pos - 1, SCE_RUST_IDENTIFIER);
+	} else {
+		styler.ColourTo(pos - 1, SCE_RUST_LEXERROR);
+	}
+}
+
 static void ScanIdentifier(Accessor& styler, Sci_Position& pos, WordList *keywords) {
 	Sci_Position start = pos;
 	while (IsIdentifierContinue(styler.SafeGetCharAt(pos, '\0')))
@@ -707,6 +722,9 @@ void SCI_METHOD LexerRust::Lex(Sci_PositionU startPos, Sci_Position length, int
 			ScanWhitespace(styler, pos, max);
 		} else if (c == '/' && (n == '/' || n == '*')) {
 			ScanComments(styler, pos, max);
+		} else if (c == 'r' && (n == '#' && IsIdentifierStart(n2))) {
+			pos += 2;
+			ScanRawIdentifier(styler, pos);
 		} else if (c == 'r' && (n == '#' || n == '"')) {
 			ScanRawString(styler, pos, max, false);
 		} else if (c == 'b' && n == 'r' && (n2 == '#' || n2 == '"')) {
diff --git a/src/lexilla/lexers/LexSQL.cxx b/src/lexilla/lexers/LexSQL.cxx
index 3e962b846..3c9081f29 100644
--- a/src/lexilla/lexers/LexSQL.cxx
+++ b/src/lexilla/lexers/LexSQL.cxx
@@ -7,12 +7,10 @@
 // Copyright 1998-2012 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cctype>
 
 #include <string>
 #include <string_view>
@@ -38,25 +36,27 @@
 using namespace Scintilla;
 using namespace Lexilla;
 
-static inline bool IsAWordChar(int ch, bool sqlAllowDottedWord) {
+namespace {
+
+bool IsAWordChar(int ch, bool sqlAllowDottedWord) noexcept {
 	if (!sqlAllowDottedWord)
 		return (ch < 0x80) && (isalnum(ch) || ch == '_');
 	else
 		return (ch < 0x80) && (isalnum(ch) || ch == '_' || ch == '.');
 }
 
-static inline bool IsAWordStart(int ch) {
+bool IsAWordStart(int ch) noexcept {
 	return (ch < 0x80) && (isalpha(ch) || ch == '_');
 }
 
-static inline bool IsADoxygenChar(int ch) {
+bool IsADoxygenChar(int ch) noexcept {
 	return (islower(ch) || ch == '$' || ch == '@' ||
 	        ch == '\\' || ch == '&' || ch == '<' ||
 	        ch == '>' || ch == '#' || ch == '{' ||
 	        ch == '}' || ch == '[' || ch == ']');
 }
 
-static inline bool IsANumberChar(int ch, int chPrev) {
+bool IsANumberChar(int ch, int chPrev) noexcept {
 	// Not exactly following number definition (several dots are seen as OK, etc.)
 	// but probably enough in most cases.
 	return (ch < 0x80) &&
@@ -263,7 +263,7 @@ struct OptionsSQL {
 	}
 };
 
-static const char * const sqlWordListDesc[] = {
+const char * const sqlWordListDesc[] = {
 	"Keywords",
 	"Database Objects",
 	"PLDoc",
@@ -272,7 +272,7 @@ static const char * const sqlWordListDesc[] = {
 	"User Keywords 2",
 	"User Keywords 3",
 	"User Keywords 4",
-	0
+	nullptr
 };
 
 struct OptionSetSQL : public OptionSet<OptionsSQL> {
@@ -381,10 +381,10 @@ public :
 	}
 
 	bool IsCommentLine (Sci_Position line, LexAccessor &styler) {
-		Sci_Position pos = styler.LineStart(line);
-		Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+		const Sci_Position pos = styler.LineStart(line);
+		const Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
 		for (Sci_Position i = pos; i + 1 < eol_pos; i++) {
-			int style = styler.StyleAt(i);
+			const int style = styler.StyleAt(i);
 			// MySQL needs -- comments to be followed by space or control char
 			if (style == SCE_SQL_COMMENTLINE && styler.Match(i, "--"))
 				return true;
@@ -437,10 +437,7 @@ Sci_Position SCI_METHOD LexerSQL::WordListSet(int n, const char *wl) {
 	}
 	Sci_Position firstModification = -1;
 	if (wordListN) {
-		WordList wlNew;
-		wlNew.Set(wl);
-		if (*wordListN != wlNew) {
-			wordListN->Set(wl);
+		if (wordListN->Set(wl)) {
 			firstModification = 0;
 		}
 	}
@@ -627,7 +624,7 @@ void SCI_METHOD LexerSQL::Lex(Sci_PositionU startPos, Sci_Position length, int i
 				sc.SetState(SCE_SQL_CHARACTER);
 			} else if (sc.ch == '\"') {
 				sc.SetState(SCE_SQL_STRING);
-			} else if (isoperator(static_cast<char>(sc.ch))) {
+			} else if (isoperator(sc.ch)) {
 				sc.SetState(SCE_SQL_OPERATOR);
 			}
 		}
@@ -650,7 +647,7 @@ void SCI_METHOD LexerSQL::Fold(Sci_PositionU startPos, Sci_Position length, int
 		// And keep going back until we find an operator ';' followed
 		// by white-space and/or comments. This will improve folding.
 		while (--startPos > 0) {
-			char ch = styler[startPos];
+			const char ch = styler[startPos];
 			if (ch == '\n' || (ch == '\r' && styler[startPos + 1] != '\n')) {
 				lastNLPos = startPos;
 			} else if (ch == ';' &&
@@ -659,7 +656,7 @@ void SCI_METHOD LexerSQL::Fold(Sci_PositionU startPos, Sci_Position length, int
 				for (Sci_Position tempPos = startPos + 1;
 				     tempPos < lastNLPos;
 				     ++tempPos) {
-					int tempStyle = styler.StyleAt(tempPos);
+					const int tempStyle = styler.StyleAt(tempPos);
 					if (!IsCommentStyle(tempStyle)
 					    && tempStyle != SCE_SQL_DEFAULT) {
 						isAllClear = false;
@@ -679,7 +676,7 @@ void SCI_METHOD LexerSQL::Fold(Sci_PositionU startPos, Sci_Position length, int
 	// And because folding ends at ';', keep going until we find one
 	// Otherwise if create ... view ... as is split over multiple
 	// lines the folding won't always update immediately.
-	Sci_PositionU docLength = styler.Length();
+	const Sci_PositionU docLength = styler.Length();
 	for (; endPos < docLength; ++endPos) {
 		if (styler.SafeGetCharAt(endPos) == ';') {
 			break;
@@ -700,12 +697,12 @@ void SCI_METHOD LexerSQL::Fold(Sci_PositionU startPos, Sci_Position length, int
 		sqlStatesCurrentLine = sqlStates.ForLine(lineCurrent);
 	}
 	for (Sci_PositionU i = startPos; i < endPos; i++) {
-		char ch = chNext;
+		const char ch = chNext;
 		chNext = styler.SafeGetCharAt(i + 1);
-		int stylePrev = style;
+		const int stylePrev = style;
 		style = styleNext;
 		styleNext = styler.StyleAt(i + 1);
-		bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+		const bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
 		if (atEOL || (!IsCommentStyle(style) && ch == ';')) {
 			if (endFound) {
 				//Maybe this is the end of "EXCEPTION" BLOCK (eg. "BEGIN ... EXCEPTION ... END;")
@@ -750,8 +747,8 @@ void SCI_METHOD LexerSQL::Fold(Sci_PositionU startPos, Sci_Position length, int
 		if (options.foldComment && (style == SCE_SQL_COMMENTLINE)) {
 			// MySQL needs -- comments to be followed by space or control char
 			if ((ch == '-') && (chNext == '-')) {
-				char chNext2 = styler.SafeGetCharAt(i + 2);
-				char chNext3 = styler.SafeGetCharAt(i + 3);
+				const char chNext2 = styler.SafeGetCharAt(i + 2);
+				const char chNext3 = styler.SafeGetCharAt(i + 3);
 				if (chNext2 == '{' || chNext3 == '{') {
 					levelNext++;
 				} else if (chNext2 == '}' || chNext3 == '}') {
@@ -779,7 +776,7 @@ void SCI_METHOD LexerSQL::Fold(Sci_PositionU startPos, Sci_Position length, int
 		}
 		// If new keyword (cannot trigger on elseif or nullif, does less tests)
 		if (style == SCE_SQL_WORD && stylePrev != SCE_SQL_WORD) {
-			const int MAX_KW_LEN = 9;	// Maximum length of folding keywords
+			constexpr int MAX_KW_LEN = 9;	// Maximum length of folding keywords
 			char s[MAX_KW_LEN + 2];
 			unsigned int j = 0;
 			for (; j < MAX_KW_LEN + 1; j++) {
@@ -950,7 +947,7 @@ void SCI_METHOD LexerSQL::Fold(Sci_PositionU startPos, Sci_Position length, int
 			}
 		}
 		if (atEOL) {
-			int levelUse = levelCurrent;
+			const int levelUse = levelCurrent;
 			int lev = levelUse | levelNext << 16;
 			if (visibleChars == 0 && options.foldCompact)
 				lev |= SC_FOLDLEVELWHITEFLAG;
@@ -972,4 +969,6 @@ void SCI_METHOD LexerSQL::Fold(Sci_PositionU startPos, Sci_Position length, int
 	}
 }
 
+}
+
 LexerModule lmSQL(SCLEX_SQL, LexerSQL::LexerFactorySQL, "sql", sqlWordListDesc);
diff --git a/src/lexilla/lexers/LexVB.cxx b/src/lexilla/lexers/LexVB.cxx
index 15156fe8c..e05379ff4 100644
--- a/src/lexilla/lexers/LexVB.cxx
+++ b/src/lexilla/lexers/LexVB.cxx
@@ -5,12 +5,10 @@
 // Copyright 1998-2005 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <ctype.h>
+#include <cstdlib>
+#include <cassert>
+#include <cstring>
+#include <cctype>
 
 #include <string>
 #include <string_view>
@@ -28,30 +26,31 @@
 
 using namespace Lexilla;
 
-// Internal state, highlighted as number
-#define SCE_B_FILENUMBER SCE_B_DEFAULT+100
+namespace {
 
+// Internal state, highlighted as number
+constexpr int SCE_B_FILENUMBER = SCE_B_DEFAULT + 100;
 
-static bool IsVBComment(Accessor &styler, Sci_Position pos, Sci_Position len) {
+bool IsVBComment(Accessor &styler, Sci_Position pos, Sci_Position len) {
 	return len > 0 && styler[pos] == '\'';
 }
 
-static inline bool IsTypeCharacter(int ch) {
+constexpr bool IsTypeCharacter(int ch) noexcept {
 	return ch == '%' || ch == '&' || ch == '@' || ch == '!' || ch == '#' || ch == '$';
 }
 
 // Extended to accept accented characters
-static inline bool IsAWordChar(int ch) {
+bool IsAWordChar(int ch) noexcept {
 	return ch >= 0x80 ||
 	       (isalnum(ch) || ch == '.' || ch == '_');
 }
 
-static inline bool IsAWordStart(int ch) {
+bool IsAWordStart(int ch) noexcept {
 	return ch >= 0x80 ||
 	       (isalpha(ch) || ch == '_');
 }
 
-static inline bool IsANumberChar(int ch) {
+bool IsANumberChar(int ch) noexcept {
 	// Not exactly following number definition (several dots are seen as OK, etc.)
 	// but probably enough in most cases.
 	return (ch < 0x80) &&
@@ -59,13 +58,13 @@ static inline bool IsANumberChar(int ch) {
              ch == '.' || ch == '-' || ch == '+' || ch == '_');
 }
 
-static void ColouriseVBDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+void ColouriseVBDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
                            WordList *keywordlists[], Accessor &styler, bool vbScriptSyntax) {
 
-	WordList &keywords = *keywordlists[0];
-	WordList &keywords2 = *keywordlists[1];
-	WordList &keywords3 = *keywordlists[2];
-	WordList &keywords4 = *keywordlists[3];
+	const WordList &keywords = *keywordlists[0];
+	const WordList &keywords2 = *keywordlists[1];
+	const WordList &keywords3 = *keywordlists[2];
+	const WordList &keywords4 = *keywordlists[3];
 
 	styler.StartAt(startPos);
 
@@ -74,7 +73,7 @@ static void ColouriseVBDoc(Sci_PositionU startPos, Sci_Position length, int init
 
 	// property lexer.vb.strings.multiline
 	//  Set to 1 to allow strings to continue over line ends.
-	bool allowMultilineStr = styler.GetPropertyInt("lexer.vb.strings.multiline", 0) != 0;
+	const bool allowMultilineStr = styler.GetPropertyInt("lexer.vb.strings.multiline", 0) != 0;
 
 	// Do not leak onto next line
 	if (initStyle == SCE_B_STRINGEOL || initStyle == SCE_B_COMMENT || initStyle == SCE_B_PREPROCESSOR) {
@@ -214,7 +213,7 @@ static void ColouriseVBDoc(Sci_PositionU startPos, Sci_Position length, int init
 				sc.SetState(SCE_B_NUMBER);
 			} else if (IsAWordStart(sc.ch) || (sc.ch == '[')) {
 				sc.SetState(SCE_B_IDENTIFIER);
-			} else if (isoperator(static_cast<char>(sc.ch)) || (sc.ch == '\\')) {	// Integer division
+			} else if (isoperator(sc.ch) || (sc.ch == '\\')) {	// Integer division
 				sc.SetState(SCE_B_OPERATOR);
 			}
 		}
@@ -263,9 +262,9 @@ static void ColouriseVBDoc(Sci_PositionU startPos, Sci_Position length, int init
 	sc.Complete();
 }
 
-static void FoldVBDoc(Sci_PositionU startPos, Sci_Position length, int,
+void FoldVBDoc(Sci_PositionU startPos, Sci_Position length, int,
 						   WordList *[], Accessor &styler) {
-	Sci_Position endPos = startPos + length;
+	const Sci_Position endPos = startPos + length;
 
 	// Backtrack to previous line in case need to fix its fold status
 	Sci_Position lineCurrent = styler.GetLine(startPos);
@@ -279,12 +278,12 @@ static void FoldVBDoc(Sci_PositionU startPos, Sci_Position length, int,
 	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, IsVBComment);
 	char chNext = styler[startPos];
 	for (Sci_Position i = startPos; i < endPos; i++) {
-		char ch = chNext;
+		const char ch = chNext;
 		chNext = styler.SafeGetCharAt(i + 1);
 
 		if ((ch == '\r' && chNext != '\n') || (ch == '\n') || (i == endPos)) {
 			int lev = indentCurrent;
-			int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsVBComment);
+			const int indentNext = styler.IndentAmount(lineCurrent + 1, &spaceFlags, IsVBComment);
 			if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG)) {
 				// Only non whitespace lines can be headers
 				if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext & SC_FOLDLEVELNUMBERMASK)) {
@@ -292,7 +291,7 @@ static void FoldVBDoc(Sci_PositionU startPos, Sci_Position length, int,
 				} else if (indentNext & SC_FOLDLEVELWHITEFLAG) {
 					// Line after is blank so check the next - maybe should continue further?
 					int spaceFlags2 = 0;
-					int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsVBComment);
+					const int indentNext2 = styler.IndentAmount(lineCurrent + 2, &spaceFlags2, IsVBComment);
 					if ((indentCurrent & SC_FOLDLEVELNUMBERMASK) < (indentNext2 & SC_FOLDLEVELNUMBERMASK)) {
 						lev |= SC_FOLDLEVELHEADERFLAG;
 					}
@@ -305,24 +304,26 @@ static void FoldVBDoc(Sci_PositionU startPos, Sci_Position length, int,
 	}
 }
 
-static void ColouriseVBNetDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+void ColouriseVBNetDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
                            WordList *keywordlists[], Accessor &styler) {
 	ColouriseVBDoc(startPos, length, initStyle, keywordlists, styler, false);
 }
 
-static void ColouriseVBScriptDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
+void ColouriseVBScriptDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
                            WordList *keywordlists[], Accessor &styler) {
 	ColouriseVBDoc(startPos, length, initStyle, keywordlists, styler, true);
 }
 
-static const char * const vbWordListDesc[] = {
+const char * const vbWordListDesc[] = {
 	"Keywords",
 	"user1",
 	"user2",
 	"user3",
-	0
+	nullptr
 };
 
+}
+
 LexerModule lmVB(SCLEX_VB, ColouriseVBNetDoc, "vb", FoldVBDoc, vbWordListDesc);
 LexerModule lmVBScript(SCLEX_VBSCRIPT, ColouriseVBScriptDoc, "vbscript", FoldVBDoc, vbWordListDesc);
 
diff --git a/src/lexilla/lexlib/CharacterCategory.cxx b/src/lexilla/lexlib/CharacterCategory.cxx
index ed97a485d..bebdf6680 100644
--- a/src/lexilla/lexlib/CharacterCategory.cxx
+++ b/src/lexilla/lexlib/CharacterCategory.cxx
@@ -4048,12 +4048,17 @@ constexpr int maskCategory = 0x1F;
 // possibly for 0..0xff for most Western European text or 0..0xfff for most
 // alphabetic languages.
 
-CharacterCategory CategoriseCharacter(int character) {
+CharacterCategory CategoriseCharacter(int character) noexcept {
 	if (character < 0 || character > maxUnicode)
 		return ccCn;
 	const int baseValue = character * (maskCategory+1) + maskCategory;
-	const int *placeAfter = std::lower_bound(catRanges, std::end(catRanges), baseValue);
-	return static_cast<CharacterCategory>(*(placeAfter-1) & maskCategory);
+	try {
+		// lower_bound will never throw with these args but its not marked noexcept so add catch to pretend.
+		const int *placeAfter = std::lower_bound(catRanges, std::end(catRanges), baseValue);
+		return static_cast<CharacterCategory>(*(placeAfter - 1) & maskCategory);
+	} catch (...) {
+		return ccCn;
+	}
 }
 
 // Implementation of character sets recommended for identifiers in Unicode Standard Annex #31.
@@ -4156,7 +4161,7 @@ bool OmitXidContinue(int character) noexcept {
 
 // UAX #31 defines ID_Start as
 // [[:L:][:Nl:][:Other_ID_Start:]--[:Pattern_Syntax:]--[:Pattern_White_Space:]]
-bool IsIdStart(int character) {
+bool IsIdStart(int character) noexcept {
 	if (IsIdPattern(character)) {
 		return false;
 	}
@@ -4171,7 +4176,7 @@ bool IsIdStart(int character) {
 
 // UAX #31 defines ID_Continue as
 // [[:ID_Start:][:Mn:][:Mc:][:Nd:][:Pc:][:Other_ID_Continue:]--[:Pattern_Syntax:]--[:Pattern_White_Space:]]
-bool IsIdContinue(int character) {
+bool IsIdContinue(int character) noexcept {
 	if (IsIdPattern(character)) {
 		return false;
 	}
@@ -4185,7 +4190,7 @@ bool IsIdContinue(int character) {
 }
 
 // XID_Start is ID_Start modified for Normalization Form KC in UAX #31
-bool IsXidStart(int character) {
+bool IsXidStart(int character) noexcept {
 	if (OmitXidStart(character)) {
 		return false;
 	} else {
@@ -4194,7 +4199,7 @@ bool IsXidStart(int character) {
 }
 
 // XID_Continue is ID_Continue modified for Normalization Form KC in UAX #31
-bool IsXidContinue(int character) {
+bool IsXidContinue(int character) noexcept {
 	if (OmitXidContinue(character)) {
 		return false;
 	} else {
diff --git a/src/lexilla/lexlib/CharacterCategory.h b/src/lexilla/lexlib/CharacterCategory.h
index f8e5c7b0d..948a884c0 100644
--- a/src/lexilla/lexlib/CharacterCategory.h
+++ b/src/lexilla/lexlib/CharacterCategory.h
@@ -20,20 +20,20 @@ enum CharacterCategory {
 	ccCc, ccCf, ccCs, ccCo, ccCn
 };
 
-CharacterCategory CategoriseCharacter(int character);
+CharacterCategory CategoriseCharacter(int character) noexcept;
 
 // Common definitions of allowable characters in identifiers from UAX #31.
-bool IsIdStart(int character);
-bool IsIdContinue(int character);
-bool IsXidStart(int character);
-bool IsXidContinue(int character);
+bool IsIdStart(int character) noexcept;
+bool IsIdContinue(int character) noexcept;
+bool IsXidStart(int character) noexcept;
+bool IsXidContinue(int character) noexcept;
 
 class CharacterCategoryMap {
 private:
 	std::vector<unsigned char> dense;
 public:
 	CharacterCategoryMap();
-	CharacterCategory CategoryFor(int character) const {
+	CharacterCategory CategoryFor(int character) const noexcept {
 		if (static_cast<size_t>(character) < dense.size()) {
 			return static_cast<CharacterCategory>(dense[character]);
 		} else {
diff --git a/src/lexilla/lexlib/CharacterSet.cxx b/src/lexilla/lexlib/CharacterSet.cxx
index 1b6770052..619776db2 100644
--- a/src/lexilla/lexlib/CharacterSet.cxx
+++ b/src/lexilla/lexlib/CharacterSet.cxx
@@ -9,6 +9,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#include <string_view>
+
 #include "CharacterSet.h"
 
 using namespace Lexilla;
@@ -30,6 +32,18 @@ int CompareCaseInsensitive(const char *a, const char *b) noexcept {
 	return *a - *b;
 }
 
+bool EqualCaseInsensitive(std::string_view a, std::string_view b) noexcept {
+	if (a.length() != b.length()) {
+		return false;
+	}
+	for (size_t i = 0; i < a.length(); i++) {
+		if (MakeUpperCase(a[i]) != MakeUpperCase(b[i])) {
+			return false;
+		}
+	}
+	return true;
+}
+
 int CompareNCaseInsensitive(const char *a, const char *b, size_t len) noexcept {
 	while (*a && *b && len) {
 		if (*a != *b) {
diff --git a/src/lexilla/lexlib/CharacterSet.h b/src/lexilla/lexlib/CharacterSet.h
index 5b0486e42..3b1f4890e 100644
--- a/src/lexilla/lexlib/CharacterSet.h
+++ b/src/lexilla/lexlib/CharacterSet.h
@@ -187,6 +187,7 @@ constexpr T MakeLowerCase(T ch) noexcept {
 }
 
 int CompareCaseInsensitive(const char *a, const char *b) noexcept;
+bool EqualCaseInsensitive(std::string_view a, std::string_view b) noexcept;
 int CompareNCaseInsensitive(const char *a, const char *b, size_t len) noexcept;
 
 }
diff --git a/src/lexilla/lexlib/InList.cxx b/src/lexilla/lexlib/InList.cxx
new file mode 100644
index 000000000..4d7b75174
--- /dev/null
+++ b/src/lexilla/lexlib/InList.cxx
@@ -0,0 +1,37 @@
+// Scintilla source code edit control
+/** @file InList.cxx
+ ** Check if a string is in a list.
+ **/
+// Copyright 2024 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#include <cassert>
+
+#include <string>
+#include <string_view>
+#include <initializer_list>
+
+#include "InList.h"
+#include "CharacterSet.h"
+
+namespace Lexilla {
+
+bool InList(std::string_view value, std::initializer_list<std::string_view> list) noexcept {
+	for (const std::string_view element : list) {
+		if (value == element) {
+			return true;
+		}
+	}
+	return false;
+}
+
+bool InListCaseInsensitive(std::string_view value, std::initializer_list<std::string_view> list) noexcept {
+	for (const std::string_view element : list) {
+		if (EqualCaseInsensitive(value, element)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+}
diff --git a/src/lexilla/lexlib/InList.h b/src/lexilla/lexlib/InList.h
new file mode 100644
index 000000000..9e52ff6f0
--- /dev/null
+++ b/src/lexilla/lexlib/InList.h
@@ -0,0 +1,18 @@
+// Scintilla source code edit control
+/** @file InList.h
+ ** Check if a string is in a list.
+ **/
+// Copyright 2024 by Neil Hodgson <neilh@scintilla.org>
+// The License.txt file describes the conditions under which this software may be distributed.
+
+#ifndef INLIST_H
+#define INLIST_H
+
+namespace Lexilla {
+
+bool InList(std::string_view value, std::initializer_list<std::string_view> list) noexcept;
+bool InListCaseInsensitive(std::string_view value, std::initializer_list<std::string_view> list) noexcept;
+
+}
+
+#endif
diff --git a/src/lexilla/lexlib/OptionSet.h b/src/lexilla/lexlib/OptionSet.h
index 09f6058ba..6abedc00d 100644
--- a/src/lexilla/lexlib/OptionSet.h
+++ b/src/lexilla/lexlib/OptionSet.h
@@ -97,6 +97,15 @@ class OptionSet {
 		nameToDef[name] = Option(ps, description);
 		AppendName(name);
 	}
+	template <typename E>
+	void DefineProperty(const char *name, E T::*pe, std::string_view description="") {
+		static_assert(std::is_enum<E>::value);
+		plcoi pi {};
+		static_assert(sizeof(pe) == sizeof(pi));
+		memcpy(&pi, &pe, sizeof(pe));
+		nameToDef[name] = Option(pi, description);
+		AppendName(name);
+	}
 	const char *PropertyNames() const noexcept {
 		return names.c_str();
 	}
diff --git a/src/lexilla/lexlib/SubStyles.h b/src/lexilla/lexlib/SubStyles.h
index 37eb4a407..ecf7d46d7 100644
--- a/src/lexilla/lexlib/SubStyles.h
+++ b/src/lexilla/lexlib/SubStyles.h
@@ -22,7 +22,7 @@ class WordClassifier {
 	explicit WordClassifier(int baseStyle_) : baseStyle(baseStyle_), firstStyle(0), lenStyles(0) {
 	}
 
-	void Allocate(int firstStyle_, int lenStyles_) {
+	void Allocate(int firstStyle_, int lenStyles_) noexcept {
 		firstStyle = firstStyle_;
 		lenStyles = lenStyles_;
 		wordToStyle.clear();
@@ -92,6 +92,10 @@ class WordClassifier {
 	}
 };
 
+// This is the common configuration: 64 sub-styles allocated from 128 to 191
+constexpr int SubStylesFirst = 0x80;
+constexpr int SubStylesAvailable = 0x40;
+
 class SubStyles {
 	int classifications;
 	const char *baseStyles;
@@ -121,7 +125,7 @@ class SubStyles {
 
 public:
 
-	SubStyles(const char *baseStyles_, int styleFirst_, int stylesAvailable_, int secondaryDistance_) :
+	SubStyles(const char *baseStyles_, int styleFirst_=SubStylesFirst, int stylesAvailable_=SubStylesAvailable, int secondaryDistance_=0) :
 		classifications(0),
 		baseStyles(baseStyles_),
 		styleFirst(styleFirst_),
@@ -134,7 +138,7 @@ class SubStyles {
 		}
 	}
 
-	int Allocate(int styleBase, int numberStyles) {
+	int Allocate(int styleBase, int numberStyles) noexcept {
 		const int block = BlockFromBaseStyle(styleBase);
 		if (block >= 0) {
 			if ((allocated + numberStyles) > stylesAvailable)
diff --git a/src/lexilla/lexlib/WordList.cxx b/src/lexilla/lexlib/WordList.cxx
index 5cab08142..b2ce00f07 100644
--- a/src/lexilla/lexlib/WordList.cxx
+++ b/src/lexilla/lexlib/WordList.cxx
@@ -242,7 +242,7 @@ bool WordList::InListAbbreviated(const char *s, const char marker) const noexcep
 	return false;
 }
 
-/** similar to InListAbbreviated, but word s can be a abridged version of a keyword.
+/** similar to InListAbbreviated, but word s can be an abridged version of a keyword.
 * eg. the keyword is defined as "after.~:". This means the word must have a prefix (begins with) of
 * "after." and suffix (ends with) of ":" to be a keyword, Hence "after.field:" , "after.form.item:" are valid.
 * Similarly "~.is.valid" keyword is suffix only... hence "field.is.valid" , "form.is.valid" are valid.
diff --git a/src/lexilla/lexlib/WordList.h b/src/lexilla/lexlib/WordList.h
index cd65b85ab..b0ca12131 100644
--- a/src/lexilla/lexlib/WordList.h
+++ b/src/lexilla/lexlib/WordList.h
@@ -13,7 +13,7 @@ namespace Lexilla {
 /**
  */
 class WordList {
-	// Each word contains at least one character - a empty word acts as sentinel at the end.
+	// Each word contains at least one character - an empty word acts as sentinel at the end.
 	char **words;
 	char *list;
 	size_t len;
diff --git a/src/lexilla/scripts/HeaderOrder.txt b/src/lexilla/scripts/HeaderOrder.txt
index a4b3046e5..71f5807f9 100644
--- a/src/lexilla/scripts/HeaderOrder.txt
+++ b/src/lexilla/scripts/HeaderOrder.txt
@@ -81,6 +81,7 @@
 // lexlib
 #include "StringCopy.h"
 #include "PropSetSimple.h"
+#include "InList.h"
 #include "WordList.h"
 #include "LexAccessor.h"
 #include "Accessor.h"
diff --git a/src/lexilla/scripts/LexillaGen.py b/src/lexilla/scripts/LexillaGen.py
index f9d9d93d5..f937f4e6c 100644
--- a/src/lexilla/scripts/LexillaGen.py
+++ b/src/lexilla/scripts/LexillaGen.py
@@ -25,7 +25,7 @@
 sys.path.append(str(thisPath.parent.parent / "src"))
 import DepGen
 
-# RegenerateXcodeProject and assiciated functions is copied from scintilla/scripts/LexGen.py
+# RegenerateXcodeProject and associated functions are copied from scintilla/scripts/LexGen.py
 
 def uid24():
     """ Last 24 digits of UUID, used for item IDs in Xcode. """
diff --git a/src/lexilla/src/Lexilla.vcxproj b/src/lexilla/src/Lexilla.vcxproj
index 826e8fd9b..5fd4edc52 100644
--- a/src/lexilla/src/Lexilla.vcxproj
+++ b/src/lexilla/src/Lexilla.vcxproj
@@ -36,7 +36,7 @@
   <PropertyGroup>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
diff --git a/src/lexilla/src/Lexilla/Info.plist b/src/lexilla/src/Lexilla/Info.plist
index e4bc4369b..ae59761a5 100644
--- a/src/lexilla/src/Lexilla/Info.plist
+++ b/src/lexilla/src/Lexilla/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.3.0</string>
+	<string>5.3.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/src/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj b/src/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
index 4cdc8d28c..b479414b6 100644
--- a/src/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
+++ b/src/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
@@ -9,6 +9,8 @@
 /* Begin PBXBuildFile section */
 		00D544CC992062D2E3CD4BF6 /* LexGDScript.cxx in Sources */ = {isa = PBXBuildFile; fileRef = A383409E9A994F461550FEC1 /* LexGDScript.cxx */; };
 		283639BC268FD4EA009D58A1 /* LexAccessor.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 283639BB268FD4EA009D58A1 /* LexAccessor.cxx */; };
+		283A17AE2B47E61100DF5C82 /* InList.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 283A17AC2B47E61100DF5C82 /* InList.cxx */; };
+		283A17AF2B47E61100DF5C82 /* InList.h in Headers */ = {isa = PBXBuildFile; fileRef = 283A17AD2B47E61100DF5C82 /* InList.h */; };
 		28BA72AB24E34D5B00272C2D /* LexerBase.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 28BA728F24E34D5A00272C2D /* LexerBase.cxx */; };
 		28BA72AC24E34D5B00272C2D /* LexAccessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729024E34D5A00272C2D /* LexAccessor.h */; };
 		28BA72AD24E34D5B00272C2D /* DefaultLexer.h in Headers */ = {isa = PBXBuildFile; fileRef = 28BA729124E34D5A00272C2D /* DefaultLexer.h */; };
@@ -161,6 +163,8 @@
 /* Begin PBXFileReference section */
 		280262A5246DF655000DF3B8 /* liblexilla.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = liblexilla.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
 		283639BB268FD4EA009D58A1 /* LexAccessor.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexAccessor.cxx; path = ../../lexlib/LexAccessor.cxx; sourceTree = "<group>"; };
+		283A17AC2B47E61100DF5C82 /* InList.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InList.cxx; path = ../../lexlib/InList.cxx; sourceTree = "<group>"; };
+		283A17AD2B47E61100DF5C82 /* InList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InList.h; path = ../../lexlib/InList.h; sourceTree = "<group>"; };
 		28BA728F24E34D5A00272C2D /* LexerBase.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LexerBase.cxx; path = ../../lexlib/LexerBase.cxx; sourceTree = "<group>"; };
 		28BA729024E34D5A00272C2D /* LexAccessor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LexAccessor.h; path = ../../lexlib/LexAccessor.h; sourceTree = "<group>"; };
 		28BA729124E34D5A00272C2D /* DefaultLexer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultLexer.h; path = ../../lexlib/DefaultLexer.h; sourceTree = "<group>"; };
@@ -488,6 +492,8 @@
 				28BA72A124E34D5B00272C2D /* CharacterSet.h */,
 				28BA729C24E34D5A00272C2D /* DefaultLexer.cxx */,
 				28BA729124E34D5A00272C2D /* DefaultLexer.h */,
+				283A17AC2B47E61100DF5C82 /* InList.cxx */,
+				283A17AD2B47E61100DF5C82 /* InList.h */,
 				283639BB268FD4EA009D58A1 /* LexAccessor.cxx */,
 				28BA729024E34D5A00272C2D /* LexAccessor.h */,
 				28BA728F24E34D5A00272C2D /* LexerBase.cxx */,
@@ -529,6 +535,7 @@
 				28BA72B324E34D5B00272C2D /* Accessor.h in Headers */,
 				28BA72BE24E34D5B00272C2D /* StyleContext.h in Headers */,
 				28BA72BB24E34D5B00272C2D /* OptionSet.h in Headers */,
+				283A17AF2B47E61100DF5C82 /* InList.h in Headers */,
 				28BA72B024E34D5B00272C2D /* LexerModule.h in Headers */,
 				28BA72AC24E34D5B00272C2D /* LexAccessor.h in Headers */,
 				28BA72C524E34D5B00272C2D /* CharacterCategory.h in Headers */,
@@ -684,6 +691,7 @@
 				28BA73A624E34D9700272C2D /* LexMatlab.cxx in Sources */,
 				28BA736324E34D9700272C2D /* LexRaku.cxx in Sources */,
 				28BA736224E34D9700272C2D /* LexCPP.cxx in Sources */,
+				283A17AE2B47E61100DF5C82 /* InList.cxx in Sources */,
 				28BA738A24E34D9700272C2D /* LexOpal.cxx in Sources */,
 				28BA736E24E34D9700272C2D /* LexRegistry.cxx in Sources */,
 				28BA738224E34D9700272C2D /* LexMMIXAL.cxx in Sources */,
@@ -858,7 +866,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.3.0;
+				CURRENT_PROJECT_VERSION = 5.3.2;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 4F446KW87E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -886,7 +894,7 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.3.0;
+				CURRENT_PROJECT_VERSION = 5.3.2;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 4F446KW87E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/src/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/src/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d981003..000000000
--- a/src/lexilla/src/Lexilla/Lexilla.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/src/lexilla/src/LexillaVersion.rc b/src/lexilla/src/LexillaVersion.rc
index 2857dd455..e75919d7e 100644
--- a/src/lexilla/src/LexillaVersion.rc
+++ b/src/lexilla/src/LexillaVersion.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_LEXILLA "5.3.0"
-#define VERSION_WORDS 5, 3, 0, 0
+#define VERSION_LEXILLA "5.3.2"
+#define VERSION_WORDS 5, 3, 2, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff --git a/src/lexilla/src/deps.mak b/src/lexilla/src/deps.mak
index 34120eaed..a824b3b8c 100644
--- a/src/lexilla/src/deps.mak
+++ b/src/lexilla/src/deps.mak
@@ -33,6 +33,10 @@ $(DIR_O)/DefaultLexer.o: \
 	../lexlib/Accessor.h \
 	../lexlib/LexerModule.h \
 	../lexlib/DefaultLexer.h
+$(DIR_O)/InList.o: \
+	../lexlib/InList.cxx \
+	../lexlib/InList.h \
+	../lexlib/CharacterSet.h
 $(DIR_O)/LexAccessor.o: \
 	../lexlib/LexAccessor.cxx \
 	../../scintilla/include/ILexer.h \
@@ -257,6 +261,7 @@ $(DIR_O)/LexBash.o: \
 	../../scintilla/include/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/StringCopy.h \
+	../lexlib/InList.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/StyleContext.h \
@@ -284,6 +289,7 @@ $(DIR_O)/LexBatch.o: \
 	../../scintilla/include/Sci_Position.h \
 	../../scintilla/include/Scintilla.h \
 	../include/SciLexer.h \
+	../lexlib/InList.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/Accessor.h \
@@ -568,6 +574,7 @@ $(DIR_O)/LexErrorList.o: \
 	../../scintilla/include/Sci_Position.h \
 	../../scintilla/include/Scintilla.h \
 	../include/SciLexer.h \
+	../lexlib/InList.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/Accessor.h \
@@ -723,6 +730,7 @@ $(DIR_O)/LexHTML.o: \
 	../../scintilla/include/Sci_Position.h \
 	../../scintilla/include/Scintilla.h \
 	../include/SciLexer.h \
+	../lexlib/InList.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/Accessor.h \
@@ -730,6 +738,7 @@ $(DIR_O)/LexHTML.o: \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h \
 	../lexlib/OptionSet.h \
+	../lexlib/SubStyles.h \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexIndent.o: \
 	../lexers/LexIndent.cxx \
@@ -854,7 +863,6 @@ $(DIR_O)/LexLua.o: \
 	../../scintilla/include/Sci_Position.h \
 	../../scintilla/include/Scintilla.h \
 	../include/SciLexer.h \
-	../lexlib/StringCopy.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/Accessor.h \
@@ -862,6 +870,7 @@ $(DIR_O)/LexLua.o: \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h \
 	../lexlib/OptionSet.h \
+	../lexlib/SubStyles.h \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexMagik.o: \
 	../lexers/LexMagik.cxx \
@@ -1212,7 +1221,6 @@ $(DIR_O)/LexPython.o: \
 	../../scintilla/include/Sci_Position.h \
 	../../scintilla/include/Scintilla.h \
 	../include/SciLexer.h \
-	../lexlib/StringCopy.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/Accessor.h \
diff --git a/src/lexilla/src/lexilla.mak b/src/lexilla/src/lexilla.mak
index dfd973788..481701d8a 100644
--- a/src/lexilla/src/lexilla.mak
+++ b/src/lexilla/src/lexilla.mak
@@ -206,6 +206,7 @@ LEXLIB_OBJS=\
 	$(DIR_O)\CharacterCategory.obj \
 	$(DIR_O)\CharacterSet.obj \
 	$(DIR_O)\DefaultLexer.obj \
+	$(DIR_O)\InList.obj \
 	$(DIR_O)\LexAccessor.obj \
 	$(DIR_O)\LexerBase.obj \
 	$(DIR_O)\LexerModule.obj \
diff --git a/src/lexilla/src/nmdeps.mak b/src/lexilla/src/nmdeps.mak
index 5f1307f98..4cfd949e6 100644
--- a/src/lexilla/src/nmdeps.mak
+++ b/src/lexilla/src/nmdeps.mak
@@ -33,6 +33,10 @@ $(DIR_O)/DefaultLexer.obj: \
 	../lexlib/Accessor.h \
 	../lexlib/LexerModule.h \
 	../lexlib/DefaultLexer.h
+$(DIR_O)/InList.obj: \
+	../lexlib/InList.cxx \
+	../lexlib/InList.h \
+	../lexlib/CharacterSet.h
 $(DIR_O)/LexAccessor.obj: \
 	../lexlib/LexAccessor.cxx \
 	../../scintilla/include/ILexer.h \
@@ -257,6 +261,7 @@ $(DIR_O)/LexBash.obj: \
 	../../scintilla/include/Scintilla.h \
 	../include/SciLexer.h \
 	../lexlib/StringCopy.h \
+	../lexlib/InList.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/StyleContext.h \
@@ -284,6 +289,7 @@ $(DIR_O)/LexBatch.obj: \
 	../../scintilla/include/Sci_Position.h \
 	../../scintilla/include/Scintilla.h \
 	../include/SciLexer.h \
+	../lexlib/InList.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/Accessor.h \
@@ -568,6 +574,7 @@ $(DIR_O)/LexErrorList.obj: \
 	../../scintilla/include/Sci_Position.h \
 	../../scintilla/include/Scintilla.h \
 	../include/SciLexer.h \
+	../lexlib/InList.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/Accessor.h \
@@ -723,6 +730,7 @@ $(DIR_O)/LexHTML.obj: \
 	../../scintilla/include/Sci_Position.h \
 	../../scintilla/include/Scintilla.h \
 	../include/SciLexer.h \
+	../lexlib/InList.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/Accessor.h \
@@ -730,6 +738,7 @@ $(DIR_O)/LexHTML.obj: \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h \
 	../lexlib/OptionSet.h \
+	../lexlib/SubStyles.h \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexIndent.obj: \
 	../lexers/LexIndent.cxx \
@@ -854,7 +863,6 @@ $(DIR_O)/LexLua.obj: \
 	../../scintilla/include/Sci_Position.h \
 	../../scintilla/include/Scintilla.h \
 	../include/SciLexer.h \
-	../lexlib/StringCopy.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/Accessor.h \
@@ -862,6 +870,7 @@ $(DIR_O)/LexLua.obj: \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h \
 	../lexlib/OptionSet.h \
+	../lexlib/SubStyles.h \
 	../lexlib/DefaultLexer.h
 $(DIR_O)/LexMagik.obj: \
 	../lexers/LexMagik.cxx \
@@ -1212,7 +1221,6 @@ $(DIR_O)/LexPython.obj: \
 	../../scintilla/include/Sci_Position.h \
 	../../scintilla/include/Scintilla.h \
 	../include/SciLexer.h \
-	../lexlib/StringCopy.h \
 	../lexlib/WordList.h \
 	../lexlib/LexAccessor.h \
 	../lexlib/Accessor.h \
diff --git a/src/lexilla/test/examples/asm/AllStyles.asm b/src/lexilla/test/examples/asm/AllStyles.asm
new file mode 100644
index 000000000..251666228
--- /dev/null
+++ b/src/lexilla/test/examples/asm/AllStyles.asm
@@ -0,0 +1,52 @@
+; Enumerate all styles: 0 to 15 except for 11(comment block) which is not yet implemented.
+; This is not a viable source file, it just illustrates the different states in isolation.
+
+; comment=1
+; Comment
+
+; whitespace=0
+	; w
+
+; number=2
+11
+
+; string=3
+"String"
+
+; operator=4
++
+
+; identifier=5
+identifier
+
+; CPU instruction=6
+add
+
+; math Instruction=7
+fadd
+
+; register=8
+ECX
+
+; directive=9
+section
+
+; directive operand=10
+rel
+
+; comment block=11 is for future expansion
+
+; character=12
+'character'
+
+; string EOL=13
+"no line end
+
+; extended instruction=14
+movq
+
+; comment directive=15
+ comment ~ A multiple-line
+ comment directive~
+
+;end
diff --git a/src/lexilla/test/examples/asm/AllStyles.asm.folded b/src/lexilla/test/examples/asm/AllStyles.asm.folded
new file mode 100644
index 000000000..6fe027cf8
--- /dev/null
+++ b/src/lexilla/test/examples/asm/AllStyles.asm.folded
@@ -0,0 +1,53 @@
+ 0 400   0   ; Enumerate all styles: 0 to 15 except for 11(comment block) which is not yet implemented.
+ 0 400   0   ; This is not a viable source file, it just illustrates the different states in isolation.
+ 0 400   0   
+ 0 400   0   ; comment=1
+ 0 400   0   ; Comment
+ 0 400   0   
+ 0 400   0   ; whitespace=0
+ 0 400   0   	; w
+ 0 400   0   
+ 0 400   0   ; number=2
+ 0 400   0   11
+ 0 400   0   
+ 0 400   0   ; string=3
+ 0 400   0   "String"
+ 0 400   0   
+ 0 400   0   ; operator=4
+ 0 400   0   +
+ 0 400   0   
+ 0 400   0   ; identifier=5
+ 0 400   0   identifier
+ 0 400   0   
+ 0 400   0   ; CPU instruction=6
+ 0 400   0   add
+ 0 400   0   
+ 0 400   0   ; math Instruction=7
+ 0 400   0   fadd
+ 0 400   0   
+ 0 400   0   ; register=8
+ 0 400   0   ECX
+ 0 400   0   
+ 0 400   0   ; directive=9
+ 0 400   0   section
+ 0 400   0   
+ 0 400   0   ; directive operand=10
+ 0 400   0   rel
+ 0 400   0   
+ 0 400   0   ; comment block=11 is for future expansion
+ 0 400   0   
+ 0 400   0   ; character=12
+ 0 400   0   'character'
+ 0 400   0   
+ 0 400   0   ; string EOL=13
+ 0 400   0   "no line end
+ 0 400   0   
+ 0 400   0   ; extended instruction=14
+ 0 400   0   movq
+ 0 400   0   
+ 0 400   0   ; comment directive=15
+ 0 400   0    comment ~ A multiple-line
+ 0 400   0    comment directive~
+ 0 400   0   
+ 0 400   0   ;end
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/asm/AllStyles.asm.styled b/src/lexilla/test/examples/asm/AllStyles.asm.styled
new file mode 100644
index 000000000..74d82cb5d
--- /dev/null
+++ b/src/lexilla/test/examples/asm/AllStyles.asm.styled
@@ -0,0 +1,52 @@
+{1}; Enumerate all styles: 0 to 15 except for 11(comment block) which is not yet implemented.
+; This is not a viable source file, it just illustrates the different states in isolation.
+{0}
+{1}; comment=1
+; Comment
+{0}
+{1}; whitespace=0
+{0}	{1}; w
+{0}
+{1}; number=2
+{2}11{0}
+
+{1}; string=3
+{3}"String"{0}
+
+{1}; operator=4
+{4}+{0}
+
+{1}; identifier=5
+{5}identifier{0}
+
+{1}; CPU instruction=6
+{6}add{0}
+
+{1}; math Instruction=7
+{7}fadd{0}
+
+{1}; register=8
+{8}ECX{0}
+
+{1}; directive=9
+{9}section{0}
+
+{1}; directive operand=10
+{10}rel{0}
+
+{1}; comment block=11 is for future expansion
+{0}
+{1}; character=12
+{12}'character'{0}
+
+{1}; string EOL=13
+{13}"no line end
+{0}
+{1}; extended instruction=14
+{14}movq{0}
+
+{1}; comment directive=15
+{0} {9}comment{0} {15}~ A multiple-line
+ comment directive~{0}
+
+{1};end
diff --git a/src/lexilla/test/examples/asm/SciTE.properties b/src/lexilla/test/examples/asm/SciTE.properties
new file mode 100644
index 000000000..8acf144e4
--- /dev/null
+++ b/src/lexilla/test/examples/asm/SciTE.properties
@@ -0,0 +1,9 @@
+lexer.*.asm=asm
+
+keywords.*.asm=add sub xor mov lea call
+keywords2.*.asm=fadd
+keywords3.*.asm=rsp rax rcx rdx r8 r9 ecx
+keywords4.*.asm=db section alignb resq resqdb global extern equ .bss .text .data start comment
+keywords5.*.asm=qword rel
+keywords6.*.asm=movd movq 
+
diff --git a/src/lexilla/test/examples/batch/Issue115.bat b/src/lexilla/test/examples/batch/Issue115.bat
index d172f8921..94f64994b 100644
--- a/src/lexilla/test/examples/batch/Issue115.bat
+++ b/src/lexilla/test/examples/batch/Issue115.bat
@@ -11,3 +11,29 @@ for /f %%A in ("rem this") do echo %%A
 
 :: BackQuote command string
 for /f "usebackq" %%A in (`rem this`) do echo %%A
+
+:: Test the handling of quotes ' and " and escape ^
+:: Comment
+
+:: With quotes
+":: Text
+"":: Comment
+':: Text
+'':: Comment
+:: Mixing quotes - likely incorrect as lexer tries ' and " separately, leaving an active quote
+"'":: Text
+
+:: With escapes
+^:: Text
+^":: Comment
+^"":: Text
+^""":: Comment
+^^":: Text
+^^"":: Comment
+^^""":: Text
+
+:: With preceding command
+mkdir archive ":: Text
+mkdir archive "":: Comment
+mkdir archive ^":: Comment
+mkdir archive ^"":: Text
diff --git a/src/lexilla/test/examples/batch/Issue115.bat.folded b/src/lexilla/test/examples/batch/Issue115.bat.folded
index fe298d774..838d7a472 100644
--- a/src/lexilla/test/examples/batch/Issue115.bat.folded
+++ b/src/lexilla/test/examples/batch/Issue115.bat.folded
@@ -11,4 +11,30 @@
  0 400   0   
  0 400   0   :: BackQuote command string
  0 400   0   for /f "usebackq" %%A in (`rem this`) do echo %%A
+ 0 400   0   
+ 0 400   0   :: Test the handling of quotes ' and " and escape ^
+ 0 400   0   :: Comment
+ 0 400   0   
+ 0 400   0   :: With quotes
+ 0 400   0   ":: Text
+ 0 400   0   "":: Comment
+ 0 400   0   ':: Text
+ 0 400   0   '':: Comment
+ 0 400   0   :: Mixing quotes - likely incorrect as lexer tries ' and " separately, leaving an active quote
+ 0 400   0   "'":: Text
+ 0 400   0   
+ 0 400   0   :: With escapes
+ 0 400   0   ^:: Text
+ 0 400   0   ^":: Comment
+ 0 400   0   ^"":: Text
+ 0 400   0   ^""":: Comment
+ 0 400   0   ^^":: Text
+ 0 400   0   ^^"":: Comment
+ 0 400   0   ^^""":: Text
+ 0 400   0   
+ 0 400   0   :: With preceding command
+ 0 400   0   mkdir archive ":: Text
+ 0 400   0   mkdir archive "":: Comment
+ 0 400   0   mkdir archive ^":: Comment
+ 0 400   0   mkdir archive ^"":: Text
  0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/batch/Issue115.bat.styled b/src/lexilla/test/examples/batch/Issue115.bat.styled
index e64f0f98c..49d6c69b1 100644
--- a/src/lexilla/test/examples/batch/Issue115.bat.styled
+++ b/src/lexilla/test/examples/batch/Issue115.bat.styled
@@ -11,3 +11,29 @@
 
 {1}:: BackQuote command string
 {2}for{0} /f "usebackq" {6}%%A{2} in{0} (`rem this`){2} do echo{0} {6}%%A{0}
+
+{1}:: Test the handling of quotes ' and " and escape ^
+:: Comment
+{0}
+{1}:: With quotes
+{0}":: Text
+""{1}:: Comment
+{0}':: Text
+''{1}:: Comment
+:: Mixing quotes - likely incorrect as lexer tries ' and " separately, leaving an active quote
+{0}"'":: Text
+
+{1}:: With escapes
+{5}^::{0} Text
+{5}^{0}"{1}:: Comment
+{5}^{0}"":: Text
+{5}^{0}"""{1}:: Comment
+{5}^^{0}":: Text
+{5}^^{0}""{1}:: Comment
+{5}^^{0}""":: Text
+
+{1}:: With preceding command
+{5}mkdir{0} archive ":: Text
+{5}mkdir{0} archive ""{1}:: Comment
+{5}mkdir{0} archive ^"{1}:: Comment
+{5}mkdir{0} archive ^"":: Text
diff --git a/src/lexilla/test/examples/batch/Issue222.bat b/src/lexilla/test/examples/batch/Issue222.bat
new file mode 100644
index 000000000..9d7708009
--- /dev/null
+++ b/src/lexilla/test/examples/batch/Issue222.bat
@@ -0,0 +1,26 @@
+rem Keywords with colon
+
+rem with spacing
+call file.bat arg1
+call "file.bat" arg1
+call :label arg1
+goto :label
+goto :eof
+goto label
+echo: %var%
+echo: text
+echo text
+
+rem no spacing
+call:label arg1
+goto:label
+goto:eof
+echo:%var%
+echo:text
+(call)
+(echo:)
+(goto)
+
+rem call internal commands
+call echo text
+call set "a=b"
diff --git a/src/lexilla/test/examples/batch/Issue222.bat.folded b/src/lexilla/test/examples/batch/Issue222.bat.folded
new file mode 100644
index 000000000..bacd4ed24
--- /dev/null
+++ b/src/lexilla/test/examples/batch/Issue222.bat.folded
@@ -0,0 +1,27 @@
+ 0 400   0   rem Keywords with colon
+ 0 400   0   
+ 0 400   0   rem with spacing
+ 0 400   0   call file.bat arg1
+ 0 400   0   call "file.bat" arg1
+ 0 400   0   call :label arg1
+ 0 400   0   goto :label
+ 0 400   0   goto :eof
+ 0 400   0   goto label
+ 0 400   0   echo: %var%
+ 0 400   0   echo: text
+ 0 400   0   echo text
+ 0 400   0   
+ 0 400   0   rem no spacing
+ 0 400   0   call:label arg1
+ 0 400   0   goto:label
+ 0 400   0   goto:eof
+ 0 400   0   echo:%var%
+ 0 400   0   echo:text
+ 0 400   0   (call)
+ 0 400   0   (echo:)
+ 0 400   0   (goto)
+ 0 400   0   
+ 0 400   0   rem call internal commands
+ 0 400   0   call echo text
+ 0 400   0   call set "a=b"
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/batch/Issue222.bat.styled b/src/lexilla/test/examples/batch/Issue222.bat.styled
new file mode 100644
index 000000000..76a576907
--- /dev/null
+++ b/src/lexilla/test/examples/batch/Issue222.bat.styled
@@ -0,0 +1,26 @@
+{1}rem Keywords with colon
+{0}
+{1}rem with spacing
+{2}call{5} file.bat{0} arg1
+{2}call{0} "file.bat" arg1
+{2}call{0} :label arg1
+{2}goto{0} :label
+{2}goto{0} :eof
+{2}goto{0} label
+{2}echo{0}: {6}%var%{0}
+{2}echo{0}: text
+{2}echo{0} text
+
+{1}rem no spacing
+{2}call{0}:label arg1
+{2}goto{0}:label
+{2}goto{0}:eof
+{2}echo{0}:{6}%var%{0}
+{2}echo{0}:text
+({2}call{0})
+({2}echo{0}:)
+({2}goto{0})
+
+{1}rem call internal commands
+{2}call echo{0} text
+{2}call set{0} "a=b"
diff --git a/src/lexilla/test/examples/cobol/229.cob b/src/lexilla/test/examples/cobol/229.cob
new file mode 100644
index 000000000..eb833e0a2
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/229.cob
@@ -0,0 +1,10 @@
+      * Fix string style to not continue to next line
+
+            DISPLAY MESSAGE BOX
+              "The following process must be applied to Earnings, Deduct
+      -       "ions and Company Contributions separately."
+
+LP61A            DISPLAY MESSAGE BOX 
+lp61b            "S*** strives to continually develop and improve its pr
+LP61B -          "oducts and services to deliver more value to our custo
+LP61B -          "mers." 
diff --git a/src/lexilla/test/examples/cobol/229.cob.folded b/src/lexilla/test/examples/cobol/229.cob.folded
new file mode 100644
index 000000000..08e16ff0b
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/229.cob.folded
@@ -0,0 +1,11 @@
+ 0 400   0         * Fix string style to not continue to next line
+ 0 400   0   
+ 0 400   0               DISPLAY MESSAGE BOX
+ 0 400   0                 "The following process must be applied to Earnings, Deduct
+ 0 400   0         -       "ions and Company Contributions separately."
+ 0 400   0   
+ 0 400   0   LP61A            DISPLAY MESSAGE BOX 
+ 0 400   0   lp61b            "S*** strives to continually develop and improve its pr
+ 0 400   0   LP61B -          "oducts and services to deliver more value to our custo
+ 0 400   0   LP61B -          "mers." 
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/cobol/229.cob.styled b/src/lexilla/test/examples/cobol/229.cob.styled
new file mode 100644
index 000000000..a2a706285
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/229.cob.styled
@@ -0,0 +1,10 @@
+{0}      {2}* Fix string style to not continue to next line{0}
+
+            {11}DISPLAY{0} {11}MESSAGE{0} {11}BOX{0}
+              {6}"The following process must be applied to Earnings, Deduct{0}
+      {10}-{0}       {6}"ions and Company Contributions separately."{0}
+
+{11}LP61A{0}            {11}DISPLAY{0} {11}MESSAGE{0} {11}BOX{0} 
+{11}lp61b{0}            {6}"S*** strives to continually develop and improve its pr{0}
+{11}LP61B{0} {10}-{0}          {6}"oducts and services to deliver more value to our custo{0}
+{11}LP61B{0} {10}-{0}          {6}"mers."{0} 
diff --git a/src/lexilla/test/examples/cobol/230.cob b/src/lexilla/test/examples/cobol/230.cob
new file mode 100644
index 000000000..13e63c5ca
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/230.cob
@@ -0,0 +1,7 @@
+      * Keywords starting with V to be identified and styled
+
+      * in list keywords2
+            VARIANCE
+
+      * in list keywords3
+            VARYING
diff --git a/src/lexilla/test/examples/cobol/230.cob.folded b/src/lexilla/test/examples/cobol/230.cob.folded
new file mode 100644
index 000000000..99d2b1fee
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/230.cob.folded
@@ -0,0 +1,8 @@
+ 0 400   0         * Keywords starting with V to be identified and styled
+ 0 400   0   
+ 0 400   0         * in list keywords2
+ 0 400   0               VARIANCE
+ 0 400   0   
+ 0 400   0         * in list keywords3
+ 0 400   0               VARYING
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/cobol/230.cob.styled b/src/lexilla/test/examples/cobol/230.cob.styled
new file mode 100644
index 000000000..17e552c70
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/230.cob.styled
@@ -0,0 +1,7 @@
+{0}      {2}* Keywords starting with V to be identified and styled{0}
+
+      {2}* in list keywords2{0}
+            {16}VARIANCE{0}
+
+      {2}* in list keywords3{0}
+            {8}VARYING{0}
diff --git a/src/lexilla/test/examples/cobol/231.cob b/src/lexilla/test/examples/cobol/231.cob
new file mode 100644
index 000000000..ad2f988b1
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/231.cob
@@ -0,0 +1,9 @@
+      * Comment preceded by 6 characters to be styled
+      * Include / to be styled as a comment
+
+      * Comment colored in green
+ABCDE * Comment colored in green
+ABCDEF* Comment NOT colored in green
+      / Comment NOT colored in green
+ABCDE / Comment NOT colored in green
+ABCDEF/ Comment NOT colored in green
diff --git a/src/lexilla/test/examples/cobol/231.cob.folded b/src/lexilla/test/examples/cobol/231.cob.folded
new file mode 100644
index 000000000..2276a1ef0
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/231.cob.folded
@@ -0,0 +1,10 @@
+ 0 400   0         * Comment preceded by 6 characters to be styled
+ 0 400   0         * Include / to be styled as a comment
+ 0 400   0   
+ 0 400   0         * Comment colored in green
+ 0 400   0   ABCDE * Comment colored in green
+ 0 400   0   ABCDEF* Comment NOT colored in green
+ 0 400   0         / Comment NOT colored in green
+ 0 400   0   ABCDE / Comment NOT colored in green
+ 0 400   0   ABCDEF/ Comment NOT colored in green
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/cobol/231.cob.styled b/src/lexilla/test/examples/cobol/231.cob.styled
new file mode 100644
index 000000000..b29c02e80
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/231.cob.styled
@@ -0,0 +1,9 @@
+{0}      {2}* Comment preceded by 6 characters to be styled{0}
+      {2}* Include / to be styled as a comment{0}
+
+      {2}* Comment colored in green{0}
+{11}ABCDE{0} {2}* Comment colored in green{0}
+{11}ABCDEF{2}* Comment NOT colored in green{0}
+      {2}/ Comment NOT colored in green{0}
+{11}ABCDE{0} {2}/ Comment NOT colored in green{0}
+{11}ABCDEF{2}/ Comment NOT colored in green{0}
diff --git a/src/lexilla/test/examples/cobol/AllStyles.cob b/src/lexilla/test/examples/cobol/AllStyles.cob
new file mode 100644
index 000000000..412aa1713
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/AllStyles.cob
@@ -0,0 +1,35 @@
+      *     Enumerate all styles: 0, 2 to 11, 16
+      *     SCE_C_COMMENTLINE=2
+
+      *     SCE_C_DEFAULT=0
+             
+
+      *     SCE_C_IDENTIFIER=11
+            identifier
+
+      *     SCE_C_NUMBER=4
+            4
+
+      *     SCE_C_WORD=5
+            data
+
+      *     SCE_C_WORD2=16
+            cancel
+
+      *     SCE_C_UUID=8
+            remarks
+
+      *     SCE_C_COMMENTDOC=3 not implemented
+** at line start
+
+      *     SCE_C_STRING=6
+            "string"
+
+      *     SCE_C_CHARACTER=7
+            'c'
+
+      *     SCE_C_PREPROCESSOR=9
+?preprocessor
+
+      *     SCE_C_OPERATOR=10
+            +
diff --git a/src/lexilla/test/examples/cobol/AllStyles.cob.folded b/src/lexilla/test/examples/cobol/AllStyles.cob.folded
new file mode 100644
index 000000000..08efc3400
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/AllStyles.cob.folded
@@ -0,0 +1,36 @@
+ 0 400   0         *     Enumerate all styles: 0, 2 to 11, 16
+ 0 400   0         *     SCE_C_COMMENTLINE=2
+ 0 400   0   
+ 0 400   0         *     SCE_C_DEFAULT=0
+ 0 400   0                
+ 0 400   0   
+ 0 400   0         *     SCE_C_IDENTIFIER=11
+ 0 400   0               identifier
+ 0 400   0   
+ 0 400   0         *     SCE_C_NUMBER=4
+ 0 400   0               4
+ 0 400   0   
+ 0 400   0         *     SCE_C_WORD=5
+ 0 400   0               data
+ 0 400   0   
+ 0 400   0         *     SCE_C_WORD2=16
+ 0 400   0               cancel
+ 0 400   0   
+ 0 400   0         *     SCE_C_UUID=8
+ 0 400   0               remarks
+ 0 400   0   
+ 0 400   0         *     SCE_C_COMMENTDOC=3 not implemented
+ 0 400   0   ** at line start
+ 0 400   0   
+ 0 400   0         *     SCE_C_STRING=6
+ 0 400   0               "string"
+ 0 400   0   
+ 0 400   0         *     SCE_C_CHARACTER=7
+ 0 400   0               'c'
+ 0 400   0   
+ 0 400   0         *     SCE_C_PREPROCESSOR=9
+ 0 400   0   ?preprocessor
+ 0 400   0   
+ 0 400   0         *     SCE_C_OPERATOR=10
+ 0 400   0               +
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/cobol/AllStyles.cob.styled b/src/lexilla/test/examples/cobol/AllStyles.cob.styled
new file mode 100644
index 000000000..187950e0e
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/AllStyles.cob.styled
@@ -0,0 +1,35 @@
+{0}      {2}*     Enumerate all styles: 0, 2 to 11, 16{0}
+      {2}*     SCE_C_COMMENTLINE=2{0}
+
+      {2}*     SCE_C_DEFAULT=0{0}
+             
+
+      {2}*     SCE_C_IDENTIFIER=11{0}
+            {11}identifier{0}
+
+      {2}*     SCE_C_NUMBER=4{0}
+            {4}4{0}
+
+      {2}*     SCE_C_WORD=5{0}
+            {5}data{0}
+
+      {2}*     SCE_C_WORD2=16{0}
+            {16}cancel{0}
+
+      {2}*     SCE_C_UUID=8{0}
+            {8}remarks{0}
+
+      {2}*     SCE_C_COMMENTDOC=3 not implemented{0}
+{3}** at line start{0}
+
+      {2}*     SCE_C_STRING=6{0}
+            {6}"string"{0}
+
+      {2}*     SCE_C_CHARACTER=7{0}
+            {7}'c'{0}
+
+      {2}*     SCE_C_PREPROCESSOR=9{0}
+{9}?preprocessor{0}
+
+      {2}*     SCE_C_OPERATOR=10{0}
+            {10}+{0}
diff --git a/src/lexilla/test/examples/cobol/SciTE.properties b/src/lexilla/test/examples/cobol/SciTE.properties
new file mode 100644
index 000000000..9ea359186
--- /dev/null
+++ b/src/lexilla/test/examples/cobol/SciTE.properties
@@ -0,0 +1,4 @@
+lexer.*.cob=COBOL
+keywords.*.cob=data
+keywords2.*.cob=cancel variance
+keywords3.*.cob=remarks varying
diff --git a/src/lexilla/test/examples/cpp/94Template.cxx b/src/lexilla/test/examples/cpp/94Template.cxx
new file mode 100644
index 000000000..f8c3d6e16
--- /dev/null
+++ b/src/lexilla/test/examples/cpp/94Template.cxx
@@ -0,0 +1,31 @@
+// Test JavaScript template expressions for issue 94
+
+// Basic
+var basic = `${identifier}`;
+
+// Nested
+var nested = ` ${ ` ${ 1 } ` } `;
+
+// With escapes
+var xxx = {
+    '1': `\`\u0020\${a${1 + 1}b}`,
+    '2': `\${a${ `b${1 + 2}c`.charCodeAt(2) }d}`,
+    '3': `\${a${ `b${ `c${ JSON.stringify({
+        '4': {},
+        }) }d` }e` }f}`,
+};
+
+// Original request
+fetchOptions.body = `
+{
+	"accountNumber" : "248796",
+	"customerType" : "Shipper",
+	"destinationCity" : "${order.destination.city}",
+	"destinationState" : "${order.destination.stateProvince}",
+	"destinationZip" : ${order.destination.postalCode},
+	"paymentType" : "Prepaid",
+	"shipmentInfo" :
+	{
+		"items" : [ { "shipmentClass" : "50", "shipmentWeight" : "${order.totalWeight.toString()}" } ]
+	}
+}`;
diff --git a/src/lexilla/test/examples/cpp/94Template.cxx.folded b/src/lexilla/test/examples/cpp/94Template.cxx.folded
new file mode 100644
index 000000000..57bf07022
--- /dev/null
+++ b/src/lexilla/test/examples/cpp/94Template.cxx.folded
@@ -0,0 +1,32 @@
+ 0 400 400   // Test JavaScript template expressions for issue 94
+ 1 400 400   
+ 0 400 400   // Basic
+ 0 400 400   var basic = `${identifier}`;
+ 1 400 400   
+ 0 400 400   // Nested
+ 0 400 400   var nested = ` ${ ` ${ 1 } ` } `;
+ 1 400 400   
+ 0 400 400   // With escapes
+ 2 400 401 + var xxx = {
+ 0 401 401 |     '1': `\`\u0020\${a${1 + 1}b}`,
+ 0 401 401 |     '2': `\${a${ `b${1 + 2}c`.charCodeAt(2) }d}`,
+ 2 401 406 +     '3': `\${a${ `b${ `c${ JSON.stringify({
+ 0 406 406 |         '4': {},
+ 0 406 401 |         }) }d` }e` }f}`,
+ 0 401 400 | };
+ 1 400 400   
+ 0 400 400   // Original request
+ 0 400 400   fetchOptions.body = `
+ 0 400 400   {
+ 0 400 400   	"accountNumber" : "248796",
+ 0 400 400   	"customerType" : "Shipper",
+ 0 400 400   	"destinationCity" : "${order.destination.city}",
+ 0 400 400   	"destinationState" : "${order.destination.stateProvince}",
+ 0 400 400   	"destinationZip" : ${order.destination.postalCode},
+ 0 400 400   	"paymentType" : "Prepaid",
+ 0 400 400   	"shipmentInfo" :
+ 0 400 400   	{
+ 0 400 400   		"items" : [ { "shipmentClass" : "50", "shipmentWeight" : "${order.totalWeight.toString()}" } ]
+ 0 400 400   	}
+ 0 400 400   }`;
+ 1 400 400   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/cpp/94Template.cxx.styled b/src/lexilla/test/examples/cpp/94Template.cxx.styled
new file mode 100644
index 000000000..4023480e3
--- /dev/null
+++ b/src/lexilla/test/examples/cpp/94Template.cxx.styled
@@ -0,0 +1,31 @@
+{2}// Test JavaScript template expressions for issue 94
+{0}
+{2}// Basic
+{5}var{0} {11}basic{0} {10}={0} {20}`{10}${{11}identifier{10}}{20}`{10};{0}
+
+{2}// Nested
+{5}var{0} {11}nested{0} {10}={0} {20}` {10}${{0} {20}` {10}${{0} {4}1{0} {10}}{20} `{0} {10}}{20} `{10};{0}
+
+{2}// With escapes
+{5}var{0} {11}xxx{0} {10}={0} {10}{{0}
+    {7}'1'{10}:{0} {20}`{27}\`\u0020\${20}{a{10}${{4}1{0} {10}+{0} {4}1{10}}{20}b}`{10},{0}
+    {7}'2'{10}:{0} {20}`{27}\${20}{a{10}${{0} {20}`b{10}${{4}1{0} {10}+{0} {4}2{10}}{20}c`{10}.{16}charCodeAt{10}({4}2{10}){0} {10}}{20}d}`{10},{0}
+    {7}'3'{10}:{0} {20}`{27}\${20}{a{10}${{0} {20}`b{10}${{0} {20}`c{10}${{0} {19}JSON{10}.{16}stringify{10}({{0}
+        {7}'4'{10}:{0} {10}{},{0}
+        {10}}){0} {10}}{20}d`{0} {10}}{20}e`{0} {10}}{20}f}`{10},{0}
+{10}};{0}
+
+{2}// Original request
+{11}fetchOptions{10}.{11}body{0} {10}={0} {20}`
+{
+	"accountNumber" : "248796",
+	"customerType" : "Shipper",
+	"destinationCity" : "{10}${{11}order{10}.{11}destination{10}.{11}city{10}}{20}",
+	"destinationState" : "{10}${{11}order{10}.{11}destination{10}.{11}stateProvince{10}}{20}",
+	"destinationZip" : {10}${{11}order{10}.{11}destination{10}.{11}postalCode{10}}{20},
+	"paymentType" : "Prepaid",
+	"shipmentInfo" :
+	{
+		"items" : [ { "shipmentClass" : "50", "shipmentWeight" : "{10}${{11}order{10}.{11}totalWeight{10}.{11}toString{10}()}{20}" } ]
+	}
+}`{10};{0}
diff --git a/src/lexilla/test/examples/cpp/SciTE.properties b/src/lexilla/test/examples/cpp/SciTE.properties
index 8429e1eed..e8a2a13b6 100644
--- a/src/lexilla/test/examples/cpp/SciTE.properties
+++ b/src/lexilla/test/examples/cpp/SciTE.properties
@@ -1,10 +1,10 @@
 # coding: utf-8
 lexer.*.cxx=cpp
-keywords.*.cxx=int let uuid
-keywords2.*.cxx=second Upper
+keywords.*.cxx=int let uuid var
+keywords2.*.cxx=charCodeAt second stringify Upper
 keywords3.*.cxx=file
-keywords4.*.cxx=global
-keywords5.*.cxx=
+keywords4.*.cxx=global JSON
+keywords5.*.cxx=HAVE_COLOUR FEATURE=2 VERSION(a,b)=a+b
 keywords6.*.cxx=TODO
 
 substyles.cpp.11=2
@@ -20,6 +20,7 @@ lexer.cpp.escape.sequence=1
 styling.within.preprocessor=0
 lexer.cpp.triplequoted.strings=1
 lexer.cpp.hashquoted.strings=1
+lexer.cpp.backquoted.strings=2
 
 fold=1
 fold.preprocessor=1
diff --git a/src/lexilla/test/examples/cpp/x.cxx b/src/lexilla/test/examples/cpp/x.cxx
index 3df0e0e21..7ad7d049e 100644
--- a/src/lexilla/test/examples/cpp/x.cxx
+++ b/src/lexilla/test/examples/cpp/x.cxx
@@ -28,6 +28,40 @@ b
 
 \
  
+
+// Test preprocessor active branches feature
+
+#if HAVE_COLOUR
+// Active
+#endif
+#if NOT_HAVE_COLOUR
+// Inactive
+#endif
+
+#if FEATURE==2
+// Active
+#endif
+#if FEATURE==3
+// Inactive
+#endif
+
+#if VERSION(1,2)==3
+// Active
+#endif
+#if VERSION(1,2)==4
+// Inactive
+#endif
+
+#undef HAVE_COLOUR
+#if HAVE_COLOUR
+// Inactive
+#endif
+
+#define MULTIPLY(a,b) a*b
+#if MULTIPLY(2,3)==6
+// Active
+#endif
+
 int main() {
 	double x[] = {3.14159,6.02e23,1.6e-19,1.0+1};
 	int y[] = {75,0113,0x4b};
diff --git a/src/lexilla/test/examples/cpp/x.cxx.folded b/src/lexilla/test/examples/cpp/x.cxx.folded
index 6614a95b7..96863339f 100644
--- a/src/lexilla/test/examples/cpp/x.cxx.folded
+++ b/src/lexilla/test/examples/cpp/x.cxx.folded
@@ -28,6 +28,40 @@
  1 400 400   
  0 400 400   \
  1 400 400    
+ 1 400 400   
+ 0 400 400   // Test preprocessor active branches feature
+ 1 400 400   
+ 2 400 401 + #if HAVE_COLOUR
+ 0 401 401 | // Active
+ 0 401 400 | #endif
+ 2 400 401 + #if NOT_HAVE_COLOUR
+ 0 401 401 | // Inactive
+ 0 401 400 | #endif
+ 1 400 400   
+ 2 400 401 + #if FEATURE==2
+ 0 401 401 | // Active
+ 0 401 400 | #endif
+ 2 400 401 + #if FEATURE==3
+ 0 401 401 | // Inactive
+ 0 401 400 | #endif
+ 1 400 400   
+ 2 400 401 + #if VERSION(1,2)==3
+ 0 401 401 | // Active
+ 0 401 400 | #endif
+ 2 400 401 + #if VERSION(1,2)==4
+ 0 401 401 | // Inactive
+ 0 401 400 | #endif
+ 1 400 400   
+ 0 400 400   #undef HAVE_COLOUR
+ 2 400 401 + #if HAVE_COLOUR
+ 0 401 401 | // Inactive
+ 0 401 400 | #endif
+ 1 400 400   
+ 0 400 400   #define MULTIPLY(a,b) a*b
+ 2 400 401 + #if MULTIPLY(2,3)==6
+ 0 401 401 | // Active
+ 0 401 400 | #endif
+ 1 400 400   
  2 400 401 + int main() {
  0 401 401 | 	double x[] = {3.14159,6.02e23,1.6e-19,1.0+1};
  0 401 401 | 	int y[] = {75,0113,0x4b};
diff --git a/src/lexilla/test/examples/cpp/x.cxx.styled b/src/lexilla/test/examples/cpp/x.cxx.styled
index a36116be6..f8ad726dc 100644
--- a/src/lexilla/test/examples/cpp/x.cxx.styled
+++ b/src/lexilla/test/examples/cpp/x.cxx.styled
@@ -28,6 +28,40 @@
 
 {0}\
  
+
+{2}// Test preprocessor active branches feature
+{0}
+{9}#if HAVE_COLOUR
+{2}// Active
+{9}#endif
+#if NOT_HAVE_COLOUR
+{66}// Inactive
+{9}#endif
+{0}
+{9}#if FEATURE==2
+{2}// Active
+{9}#endif
+#if FEATURE==3
+{66}// Inactive
+{9}#endif
+{0}
+{9}#if VERSION(1,2)==3
+{2}// Active
+{9}#endif
+#if VERSION(1,2)==4
+{66}// Inactive
+{9}#endif
+{0}
+{9}#undef HAVE_COLOUR
+#if HAVE_COLOUR
+{66}// Inactive
+{9}#endif
+{0}
+{9}#define MULTIPLY(a,b) a*b
+#if MULTIPLY(2,3)==6
+{2}// Active
+{9}#endif
+{0}
 {5}int{0} {11}main{10}(){0} {10}{{0}
 	{11}double{0} {11}x{10}[]{0} {10}={0} {10}{{4}3.14159{10},{4}6.02e23{10},{4}1.6e-19{10},{4}1.0{10}+{4}1{10}};{0}
 	{5}int{0} {11}y{10}[]{0} {10}={0} {10}{{4}75{10},{4}0113{10},{4}0x4b{10}};{0}
diff --git a/src/lexilla/test/examples/fortran/AllStyles.f b/src/lexilla/test/examples/fortran/AllStyles.f
new file mode 100644
index 000000000..23a180ddc
--- /dev/null
+++ b/src/lexilla/test/examples/fortran/AllStyles.f
@@ -0,0 +1,47 @@
+! Enumerate all styles: 0 to 14
+! This is not a viable source file, it just illustrates the different states in isolation.
+
+! comment=1
+! Comment
+
+! default=0
+	! w
+
+! number=2
+.37
+
+! string1=3
+'string'
+
+! string2=4
+"string"
+
+! stringeol=5
+" unclosed
+
+! operator=6
++
+
+! identifier=7
+variable
+
+! word=8
+program
+
+! word2=9
+system_clock
+
+! word3=10
+doublecomplex
+
+! preprocessor=11
+!DEC$ ATTRIBUTES DLLEXPORT::sr1
+
+! operator2=12
+.lt.
+
+! label=13
+999
+
+! continuation=14
+&
diff --git a/src/lexilla/test/examples/fortran/AllStyles.f.folded b/src/lexilla/test/examples/fortran/AllStyles.f.folded
new file mode 100644
index 000000000..7e2f0c5b0
--- /dev/null
+++ b/src/lexilla/test/examples/fortran/AllStyles.f.folded
@@ -0,0 +1,48 @@
+ 0 400   0   ! Enumerate all styles: 0 to 14
+ 0 400   0   ! This is not a viable source file, it just illustrates the different states in isolation.
+ 1 400   0   
+ 0 400   0   ! comment=1
+ 0 400   0   ! Comment
+ 1 400   0   
+ 0 400   0   ! default=0
+ 0 400   0   	! w
+ 1 400   0   
+ 0 400   0   ! number=2
+ 0 400   0   .37
+ 1 400   0   
+ 0 400   0   ! string1=3
+ 0 400   0   'string'
+ 1 400   0   
+ 0 400   0   ! string2=4
+ 0 400   0   "string"
+ 1 400   0   
+ 0 400   0   ! stringeol=5
+ 0 400   0   " unclosed
+ 1 400   0   
+ 0 400   0   ! operator=6
+ 0 400   0   +
+ 1 400   0   
+ 0 400   0   ! identifier=7
+ 0 400   0   variable
+ 1 400   0   
+ 0 400   0   ! word=8
+ 2 400   0 + program
+ 1 401   0 | 
+ 0 401   0 | ! word2=9
+ 0 401   0 | system_clock
+ 1 401   0 | 
+ 0 401   0 | ! word3=10
+ 0 401   0 | doublecomplex
+ 1 401   0 | 
+ 0 401   0 | ! preprocessor=11
+ 0 401   0 | !DEC$ ATTRIBUTES DLLEXPORT::sr1
+ 1 401   0 | 
+ 0 401   0 | ! operator2=12
+ 0 401   0 | .lt.
+ 1 401   0 | 
+ 0 401   0 | ! label=13
+ 0 401   0 | 999
+ 1 401   0 | 
+ 0 401   0 | ! continuation=14
+ 0 401   0 | &
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/fortran/AllStyles.f.styled b/src/lexilla/test/examples/fortran/AllStyles.f.styled
new file mode 100644
index 000000000..f76cc1a01
--- /dev/null
+++ b/src/lexilla/test/examples/fortran/AllStyles.f.styled
@@ -0,0 +1,47 @@
+{1}! Enumerate all styles: 0 to 14{0}
+{1}! This is not a viable source file, it just illustrates the different states in isolation.{0}
+
+{1}! comment=1{0}
+{1}! Comment{0}
+
+{1}! default=0{0}
+	{1}! w{0}
+
+{1}! number=2{0}
+{2}.37{0}
+
+{1}! string1=3{0}
+{3}'string'{0}
+
+{1}! string2=4{0}
+{4}"string"{0}
+
+{1}! stringeol=5{0}
+{5}" unclosed
+{0}
+{1}! operator=6{0}
+{6}+{0}
+
+{1}! identifier=7{0}
+{7}variable{0}
+
+{1}! word=8{0}
+{8}program{0}
+
+{1}! word2=9{0}
+{9}system_clock{0}
+
+{1}! word3=10{0}
+{10}doublecomplex{0}
+
+{1}! preprocessor=11{0}
+{11}!DEC$ ATTRIBUTES DLLEXPORT::sr1{0}
+
+{1}! operator2=12{0}
+{12}.lt.{0}
+
+{1}! label=13{0}
+{13}999{0}
+
+{1}! continuation=14{0}
+{14}&{0}
diff --git a/src/lexilla/test/examples/fortran/SciTE.properties b/src/lexilla/test/examples/fortran/SciTE.properties
new file mode 100644
index 000000000..10afbb03b
--- /dev/null
+++ b/src/lexilla/test/examples/fortran/SciTE.properties
@@ -0,0 +1,6 @@
+lexer.*.f=fortran
+keywords.*.f=do end if program
+keywords2.*.f=system_clock
+keywords3.*.f=doublecomplex
+fold=1
+fold.compact=1
diff --git a/src/lexilla/test/examples/hypertext/SciTE.properties b/src/lexilla/test/examples/hypertext/SciTE.properties
index a06532533..e3aa3c28d 100644
--- a/src/lexilla/test/examples/hypertext/SciTE.properties
+++ b/src/lexilla/test/examples/hypertext/SciTE.properties
@@ -1,10 +1,44 @@
 lexer.*=hypertext
-keywords.*=b br body content encoding head height href html img language link meta \
-name p rel runat script src strong title type version width xml xmlns
+# Tags and attributes
+keywords.*=b br body content encoding head href html img language li link meta \
+name p rel runat script src strong title type ul version xml xmlns
+# JavaScript
 keywords2.*=function var
+# Basic
 keywords3.*=dim sub
+# Python
+keywords4.*=import pass
+# PHP
 keywords5.*=echo __file__ __line__
+# SGML
+keywords6.*=ELEMENT
+
+# Tag
+substyles.hypertext.1=1
+substylewords.1.1.*=destination
+# Attribute
+substyles.hypertext.3=1
+substylewords.3.1.*=from img.height img.width
+# JavaScript
+substyles.hypertext.46=1
+substylewords.46.1.*=let
+# Server JavaScript
+substyles.hypertext.61=1
+substylewords.61.1.*=serve
+# Basic
+substyles.hypertext.74=1
+substylewords.74.1.*=peek
+# Python
+substyles.hypertext.96=1
+substylewords.96.1.*=parse
+# PHP
+substyles.hypertext.121=1
+substylewords.121.1.*=decrypt
+
 fold=1
 fold.html=1
 fold.html.preprocessor=1
 fold.hypertext.comment=1
+
+match mako.html
+  lexer.html.mako=1
diff --git a/src/lexilla/test/examples/hypertext/comment.html b/src/lexilla/test/examples/hypertext/comment.html
new file mode 100644
index 000000000..5ef8c13aa
--- /dev/null
+++ b/src/lexilla/test/examples/hypertext/comment.html
@@ -0,0 +1,8 @@
+<!----><p>1 normal comment</p>
+<!-- > and <!--><p>2 valid comment</p>
+<!--><p>3 abrupt-closing-of-empty-comment</p>
+<!---><p>4 abrupt-closing-of-empty-comment</p>
+<!----!><p>5 incorrectly-closed-comment</p>
+<!--!> <h1 value="--!><p>6 incorrectly-closed-comment</p>
+<!--<!---><p>7 nested-comment</p>
+<!--<!---!><p>8 nested-comment</p>
diff --git a/src/lexilla/test/examples/hypertext/comment.html.folded b/src/lexilla/test/examples/hypertext/comment.html.folded
new file mode 100644
index 000000000..9e53028cc
--- /dev/null
+++ b/src/lexilla/test/examples/hypertext/comment.html.folded
@@ -0,0 +1,9 @@
+ 0 400   0   <!----><p>1 normal comment</p>
+ 0 400   0   <!-- > and <!--><p>2 valid comment</p>
+ 0 400   0   <!--><p>3 abrupt-closing-of-empty-comment</p>
+ 0 400   0   <!---><p>4 abrupt-closing-of-empty-comment</p>
+ 0 400   0   <!----!><p>5 incorrectly-closed-comment</p>
+ 0 400   0   <!--!> <h1 value="--!><p>6 incorrectly-closed-comment</p>
+ 0 400   0   <!--<!---><p>7 nested-comment</p>
+ 0 400   0   <!--<!---!><p>8 nested-comment</p>
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/hypertext/comment.html.styled b/src/lexilla/test/examples/hypertext/comment.html.styled
new file mode 100644
index 000000000..cd372f7b4
--- /dev/null
+++ b/src/lexilla/test/examples/hypertext/comment.html.styled
@@ -0,0 +1,8 @@
+{9}<!---->{1}<p>{0}1 normal comment{1}</p>{0}
+{9}<!-- > and <!-->{1}<p>{0}2 valid comment{1}</p>{0}
+{9}<!-->{1}<p>{0}3 abrupt-closing-of-empty-comment{1}</p>{0}
+{9}<!--->{1}<p>{0}4 abrupt-closing-of-empty-comment{1}</p>{0}
+{9}<!----!>{1}<p>{0}5 incorrectly-closed-comment{1}</p>{0}
+{9}<!--!> <h1 value="--!>{1}<p>{0}6 incorrectly-closed-comment{1}</p>{0}
+{9}<!--<!--->{1}<p>{0}7 nested-comment{1}</p>{0}
+{9}<!--<!---!>{1}<p>{0}8 nested-comment{1}</p>{0}
diff --git a/src/lexilla/test/examples/hypertext/mako.html b/src/lexilla/test/examples/hypertext/mako.html
new file mode 100644
index 000000000..f9d2079b0
--- /dev/null
+++ b/src/lexilla/test/examples/hypertext/mako.html
@@ -0,0 +1,76 @@
+Mako examples extracted from https://docs.makotemplates.org/en/latest/syntax.html
+
+Expression
+${x}
+${}
+${pow(x,2) + pow(y,2)}
+
+Expression Escaping
+${"this is some text" | u}
+
+Control Structures
+% if x==5:
+    this is some output
+% endif
+
+% for a in ['one', 'two', 'three', 'four', 'five']:
+    % if a[0] == 't':
+    its two or three
+    % elif a[0] == 'f':
+    four/five
+    % else:
+    one
+    % endif
+% endfor
+
+The % sign can also be “escaped”, if you actually want to emit a percent sign as the first non whitespace character on a line, by escaping it as in %%:
+%% some text
+    %% some more text
+
+The Loop Context
+The loop context provides additional information about a loop while inside of a % for structure:
+
+<ul>
+% for a in ("one", "two", "three"):
+    <li>Item ${loop.index}: ${a}</li>
+% endfor
+</ul>
+
+A multiline version exists using <%doc> ...text... </%doc>:
+<%doc>
+    these are comments
+    more comments
+</%doc>
+
+Python Blocks
+Any arbitrary block of python can be dropped in using the <% %> tags:
+this is a template
+
+<%
+    x = db.get_resource('foo')
+    y = [z.element for z in x if x.frobnizzle==5]
+%>
+% for elem in y:
+    element: ${elem}
+% endfor
+Within <% %>, you’re writing a regular block of Python code. While the code can appear with an arbitrary level of preceding whitespace, it has to be consistently formatted with itself. Mako’s compiler will adjust the block of Python to be consistent with the surrounding generated Python code.
+
+Module-level Blocks
+A variant on <% %> is the module-level code block, denoted by <%! %>. Code within these tags is executed at the module level of the template, and not within the rendering function of the template. Therefore, this code does not have access to the template’s context and is only executed when the template is loaded into memory (which can be only once per application, or more, depending on the runtime environment). Use the <%! %> tags to declare your template’s imports, as well as any pure-Python functions you might want to declare:
+
+<%!
+    import mylib
+    import re
+
+    def filter(text):
+        return re.sub(r'^@', '', text)
+%>
+
+Tags
+The rest of what Mako offers takes place in the form of tags. All tags use the same syntax, which is similar to an XML tag except that the first character of the tag name is a % character. The tag is closed either by a contained slash character, or an explicit closing tag:
+
+<%include file="foo.txt"/>
+
+<%def name="foo" buffered="True">
+    this is a def
+</%def>
diff --git a/src/lexilla/test/examples/hypertext/mako.html.folded b/src/lexilla/test/examples/hypertext/mako.html.folded
new file mode 100644
index 000000000..145ab8090
--- /dev/null
+++ b/src/lexilla/test/examples/hypertext/mako.html.folded
@@ -0,0 +1,77 @@
+ 0 400   0   Mako examples extracted from https://docs.makotemplates.org/en/latest/syntax.html
+ 1 400   0   
+ 0 400   0   Expression
+ 0 400   0   ${x}
+ 0 400   0   ${}
+ 0 400   0   ${pow(x,2) + pow(y,2)}
+ 1 400   0   
+ 0 400   0   Expression Escaping
+ 0 400   0   ${"this is some text" | u}
+ 1 400   0   
+ 0 400   0   Control Structures
+ 0 400   0   % if x==5:
+ 0 400   0       this is some output
+ 0 400   0   % endif
+ 1 400   0   
+ 0 400   0   % for a in ['one', 'two', 'three', 'four', 'five']:
+ 0 400   0       % if a[0] == 't':
+ 0 400   0       its two or three
+ 0 400   0       % elif a[0] == 'f':
+ 0 400   0       four/five
+ 0 400   0       % else:
+ 0 400   0       one
+ 0 400   0       % endif
+ 0 400   0   % endfor
+ 1 400   0   
+ 0 400   0   The % sign can also be “escaped”, if you actually want to emit a percent sign as the first non whitespace character on a line, by escaping it as in %%:
+ 0 400   0   %% some text
+ 0 400   0       %% some more text
+ 1 400   0   
+ 0 400   0   The Loop Context
+ 0 400   0   The loop context provides additional information about a loop while inside of a % for structure:
+ 1 400   0   
+ 2 400   0 + <ul>
+ 0 401   0 | % for a in ("one", "two", "three"):
+ 0 401   0 |     <li>Item ${loop.index}: ${a}</li>
+ 0 401   0 | % endfor
+ 0 401   0 | </ul>
+ 1 400   0   
+ 0 400   0   A multiline version exists using <%doc> ...text... </%doc>:
+ 0 400   0   <%doc>
+ 0 400   0       these are comments
+ 0 400   0       more comments
+ 0 400   0   </%doc>
+ 1 400   0   
+ 0 400   0   Python Blocks
+ 0 400   0   Any arbitrary block of python can be dropped in using the <% %> tags:
+ 0 400   0   this is a template
+ 1 400   0   
+ 0 400   0   <%
+ 0 400   0       x = db.get_resource('foo')
+ 0 400   0       y = [z.element for z in x if x.frobnizzle==5]
+ 0 400   0   %>
+ 0 400   0   % for elem in y:
+ 0 400   0       element: ${elem}
+ 0 400   0   % endfor
+ 0 400   0   Within <% %>, you’re writing a regular block of Python code. While the code can appear with an arbitrary level of preceding whitespace, it has to be consistently formatted with itself. Mako’s compiler will adjust the block of Python to be consistent with the surrounding generated Python code.
+ 1 400   0   
+ 0 400   0   Module-level Blocks
+ 0 400   0   A variant on <% %> is the module-level code block, denoted by <%! %>. Code within these tags is executed at the module level of the template, and not within the rendering function of the template. Therefore, this code does not have access to the template’s context and is only executed when the template is loaded into memory (which can be only once per application, or more, depending on the runtime environment). Use the <%! %> tags to declare your template’s imports, as well as any pure-Python functions you might want to declare:
+ 1 400   0   
+ 0 400   0   <%!
+ 0 400   0       import mylib
+ 0 400   0       import re
+ 1 400   0   
+ 0 400   0       def filter(text):
+ 0 400   0           return re.sub(r'^@', '', text)
+ 0 400   0   %>
+ 1 400   0   
+ 0 400   0   Tags
+ 0 400   0   The rest of what Mako offers takes place in the form of tags. All tags use the same syntax, which is similar to an XML tag except that the first character of the tag name is a % character. The tag is closed either by a contained slash character, or an explicit closing tag:
+ 1 400   0   
+ 0 400   0   <%include file="foo.txt"/>
+ 1 400   0   
+ 0 400   0   <%def name="foo" buffered="True">
+ 0 400   0       this is a def
+ 0 400   0   </%def>
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/hypertext/mako.html.styled b/src/lexilla/test/examples/hypertext/mako.html.styled
new file mode 100644
index 000000000..00bd9ecae
--- /dev/null
+++ b/src/lexilla/test/examples/hypertext/mako.html.styled
@@ -0,0 +1,76 @@
+{0}Mako examples extracted from https://docs.makotemplates.org/en/latest/syntax.html
+
+Expression
+{15}${{117}x{15}}{0}
+{15}${}{0}
+{15}${{117}pow{116}({117}x{116},{108}2{116}){106} {116}+{106} {117}pow{116}({117}y{116},{108}2{116}){15}}{0}
+
+Expression Escaping
+{15}${{109}"this is some text"{106} {116}|{106} {117}u{15}}{0}
+
+Control Structures
+{15}%{106} {117}if{106} {117}x{116}=={108}5{116}:{0}
+    this is some output
+{15}%{106} {117}endif{0}
+
+{15}%{106} {117}for{106} {117}a{106} {117}in{106} {116}[{110}'one'{116},{106} {110}'two'{116},{106} {110}'three'{116},{106} {110}'four'{116},{106} {110}'five'{116}]:{0}
+    {15}%{106} {117}if{106} {117}a{116}[{108}0{116}]{106} {116}=={106} {110}'t'{116}:{0}
+    its two or three
+    {15}%{106} {117}elif{106} {117}a{116}[{108}0{116}]{106} {116}=={106} {110}'f'{116}:{0}
+    four/five
+    {15}%{106} {117}else{116}:{0}
+    one
+    {15}%{106} {117}endif{0}
+{15}%{106} {117}endfor{0}
+
+The % sign can also be “escaped”, if you actually want to emit a percent sign as the first non whitespace character on a line, by escaping it as in %%:
+{15}%{116}%{106} {117}some{106} {117}text{0}
+    {15}%{116}%{106} {117}some{106} {117}more{106} {117}text{0}
+
+The Loop Context
+The loop context provides additional information about a loop while inside of a % for structure:
+
+{1}<ul>{0}
+{15}%{106} {117}for{106} {117}a{106} {117}in{106} {116}({109}"one"{116},{106} {109}"two"{116},{106} {109}"three"{116}):{0}
+    {1}<li>{0}Item {15}${{117}loop.index{15}}{0}: {15}${{117}a{15}}{1}</li>{0}
+{15}%{106} {117}endfor{0}
+{1}</ul>{0}
+
+A multiline version exists using {15}<%{2}doc{15}>{0} ...text... {15}</%{2}doc{15}>{0}:
+{15}<%{2}doc{15}>{0}
+    these are comments
+    more comments
+{15}</%{2}doc{15}>{0}
+
+Python Blocks
+Any arbitrary block of python can be dropped in using the {15}<%{106} {15}%>{0} tags:
+this is a template
+
+{15}<%{105}
+{106}    {117}x{106} {116}={106} {117}db.get_resource{116}({110}'foo'{116}){106}
+    {117}y{106} {116}={106} {116}[{117}z.element{106} {117}for{106} {117}z{106} {117}in{106} {117}x{106} {117}if{106} {117}x.frobnizzle{116}=={108}5{116}]{106}
+{15}%>{0}
+{15}%{106} {117}for{106} {117}elem{106} {117}in{106} {117}y{116}:{0}
+    element: {15}${{117}elem{15}}{0}
+{15}%{106} {117}endfor{0}
+Within {15}<%{106} {15}%>{0}, you’re writing a regular block of Python code. While the code can appear with an arbitrary level of preceding whitespace, it has to be consistently formatted with itself. Mako’s compiler will adjust the block of Python to be consistent with the surrounding generated Python code.
+
+Module-level Blocks
+A variant on {15}<%{106} {15}%>{0} is the module-level code block, denoted by {15}<%{116}!{106} {15}%>{0}. Code within these tags is executed at the module level of the template, and not within the rendering function of the template. Therefore, this code does not have access to the template’s context and is only executed when the template is loaded into memory (which can be only once per application, or more, depending on the runtime environment). Use the {15}<%{116}!{106} {15}%>{0} tags to declare your template’s imports, as well as any pure-Python functions you might want to declare:
+
+{15}<%{116}!{105}
+{106}    {111}import{106} {117}mylib{106}
+    {111}import{106} {117}re{106}
+
+    {117}def{106} {115}filter{116}({117}text{116}):{106}
+        {117}return{106} {117}re.sub{116}({117}r{110}'^@'{116},{106} {110}''{116},{106} {117}text{116}){106}
+{15}%>{0}
+
+Tags
+The rest of what Mako offers takes place in the form of tags. All tags use the same syntax, which is similar to an XML tag except that the first character of the tag name is a % character. The tag is closed either by a contained slash character, or an explicit closing tag:
+
+{15}<%{2}include{106} {117}file{116}={109}"foo.txt"{15}/>{0}
+
+{15}<%{2}def{106} {117}name{116}={109}"foo"{106} {117}buffered{116}={109}"True"{15}>{0}
+    this is a def
+{15}</%{2}def{15}>{0}
diff --git a/src/lexilla/test/examples/hypertext/x.asp b/src/lexilla/test/examples/hypertext/x.asp
index a78acdc34..3af70cf79 100644
--- a/src/lexilla/test/examples/hypertext/x.asp
+++ b/src/lexilla/test/examples/hypertext/x.asp
@@ -1,12 +1,21 @@
 <%@language=javas%>
 <% 
 #include 
+serve x;
 function x() {
 }
 %>
 <%@language=vbscript%>
 <% 
 sub x 'comment 
+peek 1024
+%>
+<!-- Folding for Python is incorrect. See #235. -->
+<%@language=python%>
+<% 
+import random
+x = 'comment'
+parse "x=8"
 %>
 <head>
 <body></body>
diff --git a/src/lexilla/test/examples/hypertext/x.asp.folded b/src/lexilla/test/examples/hypertext/x.asp.folded
index 06cf4525f..65a8cf678 100644
--- a/src/lexilla/test/examples/hypertext/x.asp.folded
+++ b/src/lexilla/test/examples/hypertext/x.asp.folded
@@ -1,13 +1,22 @@
  0 400   0   <%@language=javas%>
  2 400   0 + <% 
  0 401   0 | #include 
+ 0 401   0 | serve x;
  2 401   0 + function x() {
  0 402   0 | }
  0 401   0 | %>
  0 400   0   <%@language=vbscript%>
  2 400   0 + <% 
  0 401   0 | sub x 'comment 
+ 0 401   0 | peek 1024
  0 401   0 | %>
- 2 400   0 + <head>
- 0 401   0 | <body></body>
- 0 401   0 | 
\ No newline at end of file
+ 0 400   0   <!-- Folding for Python is incorrect. See #235. -->
+ 0 400   0   <%@language=python%>
+ 0 400   0   <% 
+ 0 400   0   import random
+ 0 400   0   x = 'comment'
+ 0 400   0   parse "x=8"
+ 0 400   0   %>
+ 2 3ff   0 + <head>
+ 0 400   0   <body></body>
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/hypertext/x.asp.styled b/src/lexilla/test/examples/hypertext/x.asp.styled
index 920c6380d..82eed6fd3 100644
--- a/src/lexilla/test/examples/hypertext/x.asp.styled
+++ b/src/lexilla/test/examples/hypertext/x.asp.styled
@@ -1,12 +1,21 @@
 {15}<%@{16}language=javas{15}%>{0}
 {15}<%{56} 
 #{61}include{56} 
+{195}serve{56} {61}x{65};{56}
 {62}function{56} {61}x{65}(){56} {65}{{56}
 {65}}{56}
 {15}%>{0}
 {15}<%@{16}language=vbscript{15}%>{0}
 {15}<%{81} 
 {84}sub{81} {86}x{81} {82}'comment {81}
+{196}peek{81} {83}1024{81}
+{15}%>{0}
+{9}<!-- Folding for Python is incorrect. See #235. -->{0}
+{15}<%@{16}language=python{15}%>{0}
+{15}<%{106} 
+{111}import{106} {117}random{106}
+{117}x{106} {116}={106} {110}'comment'{106}
+{197}parse{106} {109}"x=8"{106}
 {15}%>{0}
 {1}<head>{0}
 {1}<body></body>{0}
diff --git a/src/lexilla/test/examples/hypertext/x.html b/src/lexilla/test/examples/hypertext/x.html
index e28149adf..7bd731ecc 100644
--- a/src/lexilla/test/examples/hypertext/x.html
+++ b/src/lexilla/test/examples/hypertext/x.html
@@ -2,6 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <script type="text/javascript">
 var b = /abc/i.test('abc');
+let b = 1;
 'x\
 </t>'
 // issue 214 fix to behave same as single quote escaped eol
@@ -14,5 +15,7 @@
     §
     <unknown>SinkWorld - Portability</unknown>
     <img src="SciTEIco.png" height=64 width=64 />
-    <link rel="stylesheet" type="text/css" href="SW.css">
+    <link rel="stylesheet" type="text/css" from="SW.css">
+    <destination href="SW.css" height=64 width=64></destination>
 </head>
+</html>
diff --git a/src/lexilla/test/examples/hypertext/x.html.folded b/src/lexilla/test/examples/hypertext/x.html.folded
index a71d2bd7f..b9a0a9c15 100644
--- a/src/lexilla/test/examples/hypertext/x.html.folded
+++ b/src/lexilla/test/examples/hypertext/x.html.folded
@@ -2,6 +2,7 @@
  2 400   0 + <html xmlns="http://www.w3.org/1999/xhtml">
  2 401   0 + <script type="text/javascript">
  0 402   0 | var b = /abc/i.test('abc');
+ 0 402   0 | let b = 1;
  0 402   0 | 'x\
  0 402   0 | </t>'
  0 402   0 | // issue 214 fix to behave same as single quote escaped eol
@@ -14,6 +15,8 @@
  0 402   0 |     §
  0 402   0 |     <unknown>SinkWorld - Portability</unknown>
  0 402   0 |     <img src="SciTEIco.png" height=64 width=64 />
- 0 402   0 |     <link rel="stylesheet" type="text/css" href="SW.css">
+ 0 402   0 |     <link rel="stylesheet" type="text/css" from="SW.css">
+ 0 402   0 |     <destination href="SW.css" height=64 width=64></destination>
  0 402   0 | </head>
- 0 401   0 | 
\ No newline at end of file
+ 0 401   0 | </html>
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/hypertext/x.html.styled b/src/lexilla/test/examples/hypertext/x.html.styled
index bd3782786..e56236d88 100644
--- a/src/lexilla/test/examples/hypertext/x.html.styled
+++ b/src/lexilla/test/examples/hypertext/x.html.styled
@@ -2,6 +2,7 @@
 {1}<html{8} {3}xmlns{8}={6}"http://www.w3.org/1999/xhtml"{1}>{0}
 {1}<script{8} {3}type{8}={6}"text/javascript"{1}>{40}
 {47}var{41} {46}b{41} {50}={41} {52}/abc/i{46}.test{50}({49}'abc'{50});{41}
+{194}let{41} {46}b{41} {50}={41} {45}1{50};{41}
 {49}'x\
 </t>'{41}
 {43}// issue 214 fix to behave same as single quote escaped eol{41}
@@ -13,6 +14,8 @@
     {1}<title>{0}SinkWorld - Portability{1}</title>{0}
     §
     {2}<unknown>{0}SinkWorld - Portability{2}</unknown>{0}
-    {1}<img{8} {3}src{8}={6}"SciTEIco.png"{8} {3}height{8}={5}64{8} {3}width{8}={5}64{8} {11}/>{0}
-    {1}<link{8} {3}rel{8}={6}"stylesheet"{8} {3}type{8}={6}"text/css"{8} {3}href{8}={6}"SW.css"{1}>{0}
+    {1}<img{8} {3}src{8}={6}"SciTEIco.png"{8} {193}height{8}={5}64{8} {193}width{8}={5}64{8} {11}/>{0}
+    {1}<link{8} {3}rel{8}={6}"stylesheet"{8} {3}type{8}={6}"text/css"{8} {193}from{8}={6}"SW.css"{1}>{0}
+    {192}<destination{8} {3}href{8}={6}"SW.css"{8} {4}height{8}={5}64{8} {4}width{8}={5}64{1}>{192}</destination>{0}
 {1}</head>{0}
+{1}</html>{0}
diff --git a/src/lexilla/test/examples/hypertext/x.php b/src/lexilla/test/examples/hypertext/x.php
index f180371bd..90ede0733 100644
--- a/src/lexilla/test/examples/hypertext/x.php
+++ b/src/lexilla/test/examples/hypertext/x.php
@@ -1,5 +1,6 @@
 <head> <!-- About to script -->
 <?php
+decrypt "xyzzy";
 echo __FILE__.__LINE__;
 echo "<!-- -->\n";
 /* ?> */
diff --git a/src/lexilla/test/examples/hypertext/x.php.folded b/src/lexilla/test/examples/hypertext/x.php.folded
index 471ebe20a..fc5388d49 100644
--- a/src/lexilla/test/examples/hypertext/x.php.folded
+++ b/src/lexilla/test/examples/hypertext/x.php.folded
@@ -1,5 +1,6 @@
  2 400   0 + <head> <!-- About to script -->
  2 401   0 + <?php
+ 0 402   0 | decrypt "xyzzy";
  0 402   0 | echo __FILE__.__LINE__;
  0 402   0 | echo "<!-- -->\n";
  0 402   0 | /* ?> */
diff --git a/src/lexilla/test/examples/hypertext/x.php.styled b/src/lexilla/test/examples/hypertext/x.php.styled
index 45e984bc2..9580ad9bb 100644
--- a/src/lexilla/test/examples/hypertext/x.php.styled
+++ b/src/lexilla/test/examples/hypertext/x.php.styled
@@ -1,5 +1,6 @@
 {1}<head>{0} {9}<!-- About to script -->{0}
 {18}<?php{118}
+{198}decrypt{118} {119}"xyzzy"{127};{118}
 {121}echo{118} {121}__FILE__{127}.{121}__LINE__{127};{118}
 {121}echo{118} {119}"<!-- -->\n"{127};{118}
 {124}/* ?> */{118}
diff --git a/src/lexilla/test/examples/lua/AllStyles.lua b/src/lexilla/test/examples/lua/AllStyles.lua
index 0761a4358..042225556 100644
--- a/src/lexilla/test/examples/lua/AllStyles.lua
+++ b/src/lexilla/test/examples/lua/AllStyles.lua
@@ -64,3 +64,6 @@ keyword8
 
 -- label=20
 ::label::
+
+-- identifier substyles.11.1=128
+moon
diff --git a/src/lexilla/test/examples/lua/AllStyles.lua.folded b/src/lexilla/test/examples/lua/AllStyles.lua.folded
index 7585be12e..079bc071d 100644
--- a/src/lexilla/test/examples/lua/AllStyles.lua.folded
+++ b/src/lexilla/test/examples/lua/AllStyles.lua.folded
@@ -64,4 +64,7 @@
  1 400   0   
  0 400   0   -- label=20
  0 400   0   ::label::
+ 1 400   0   
+ 0 400   0   -- identifier substyles.11.1=128
+ 0 400   0   moon
  0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/lua/AllStyles.lua.styled b/src/lexilla/test/examples/lua/AllStyles.lua.styled
index bacd4262c..f38acc6d8 100644
--- a/src/lexilla/test/examples/lua/AllStyles.lua.styled
+++ b/src/lexilla/test/examples/lua/AllStyles.lua.styled
@@ -64,3 +64,6 @@
 
 {2}-- label=20
 {20}::label::{0}
+
+{2}-- identifier substyles.11.1=128
+{128}moon{0}
diff --git a/src/lexilla/test/examples/lua/SciTE.properties b/src/lexilla/test/examples/lua/SciTE.properties
index 084f57061..adfab43bf 100644
--- a/src/lexilla/test/examples/lua/SciTE.properties
+++ b/src/lexilla/test/examples/lua/SciTE.properties
@@ -7,4 +7,8 @@ keywords5.*.lua=keyword5
 keywords6.*.lua=keyword6
 keywords7.*.lua=keyword7
 keywords8.*.lua=keyword8
+
+substyles.lua.11=1
+substylewords.11.1.*.lua=moon
+
 fold=1
diff --git a/src/lexilla/test/examples/matlab/FoldPoints.m.matlab b/src/lexilla/test/examples/matlab/FoldPoints.m.matlab
index 7fb866eb5..10dc369c7 100644
--- a/src/lexilla/test/examples/matlab/FoldPoints.m.matlab
+++ b/src/lexilla/test/examples/matlab/FoldPoints.m.matlab
@@ -1,4 +1,4 @@
-% All the exaples here should yeild folding
+% All the examples here should yield folding
 
 classdef
     % Some code
diff --git a/src/lexilla/test/examples/matlab/FoldPoints.m.matlab.folded b/src/lexilla/test/examples/matlab/FoldPoints.m.matlab.folded
index 484daf05b..73751d911 100644
--- a/src/lexilla/test/examples/matlab/FoldPoints.m.matlab.folded
+++ b/src/lexilla/test/examples/matlab/FoldPoints.m.matlab.folded
@@ -1,4 +1,4 @@
- 0 400 400   % All the exaples here should yeild folding
+ 0 400 400   % All the examples here should yield folding
  1 400 400   
  2 400 401 + classdef
  0 401 401 |     % Some code
diff --git a/src/lexilla/test/examples/matlab/FoldPoints.m.matlab.styled b/src/lexilla/test/examples/matlab/FoldPoints.m.matlab.styled
index 9b9593af8..b4aa64af0 100644
--- a/src/lexilla/test/examples/matlab/FoldPoints.m.matlab.styled
+++ b/src/lexilla/test/examples/matlab/FoldPoints.m.matlab.styled
@@ -1,4 +1,4 @@
-{1}% All the exaples here should yeild folding{0}
+{1}% All the examples here should yield folding{0}
 
 {4}classdef{0}
     {1}% Some code{0}
diff --git a/src/lexilla/test/examples/mysql/AllStyles.sql b/src/lexilla/test/examples/mysql/AllStyles.sql
new file mode 100644
index 000000000..e7369eb96
--- /dev/null
+++ b/src/lexilla/test/examples/mysql/AllStyles.sql
@@ -0,0 +1,70 @@
+-- Enumerate all styles: 0 to 22, except for 3 (variable) and 11 (string) which are not implemented
+-- Hidden commands with other states (ored with ox40) are also possible inside /*! ... */
+
+/* commentline=2 */
+# comment
+
+# default=0
+	# w
+
+# comment=1
+/* comment */
+
+# variable=3 is not implemented
+@variable
+
+# systemvariable=4
+@@systemvariable
+
+# knownsystemvariable=5
+@@known
+
+# number=6
+6
+
+# majorkeyword=7
+select
+
+# keyword=8
+in
+
+# databaseobject=9
+object
+
+# procedurekeyword=10
+procedure
+
+# string=11 is not implemented
+
+# sqstring=12
+'string'
+
+# dqstring=13
+"string"
+
+# operator=14
++
+
+# function=15
+function()
+
+# identifier=16
+identifier
+
+# quotedidentifier=17
+`quoted`
+
+# user1=18
+user1
+
+# user2=19
+user2
+
+# user3=20
+user3
+
+# hiddencommand=21
+/*!*/
+
+# placeholder=22
+<{placeholder>}
diff --git a/src/lexilla/test/examples/mysql/AllStyles.sql.folded b/src/lexilla/test/examples/mysql/AllStyles.sql.folded
new file mode 100644
index 000000000..840734a9b
--- /dev/null
+++ b/src/lexilla/test/examples/mysql/AllStyles.sql.folded
@@ -0,0 +1,71 @@
+ 0 400 400   -- Enumerate all styles: 0 to 22, except for 3 (variable) and 11 (string) which are not implemented
+ 0 400 400   -- Hidden commands with other states (ored with ox40) are also possible inside /*! ... */
+ 1 400 400   
+ 0 400 400   /* commentline=2 */
+ 0 400 400   # comment
+ 1 400 400   
+ 0 400 400   # default=0
+ 0 400 400   	# w
+ 1 400 400   
+ 0 400 400   # comment=1
+ 0 400 400   /* comment */
+ 1 400 400   
+ 0 400 400   # variable=3 is not implemented
+ 0 400 400   @variable
+ 1 400 400   
+ 0 400 400   # systemvariable=4
+ 0 400 400   @@systemvariable
+ 1 400 400   
+ 0 400 400   # knownsystemvariable=5
+ 0 400 400   @@known
+ 1 400 400   
+ 0 400 400   # number=6
+ 0 400 400   6
+ 1 400 400   
+ 0 400 400   # majorkeyword=7
+ 0 400 400   select
+ 1 400 400   
+ 0 400 400   # keyword=8
+ 0 400 400   in
+ 1 400 400   
+ 0 400 400   # databaseobject=9
+ 0 400 400   object
+ 1 400 400   
+ 0 400 400   # procedurekeyword=10
+ 0 400 400   procedure
+ 1 400 400   
+ 0 400 400   # string=11 is not implemented
+ 1 400 400   
+ 0 400 400   # sqstring=12
+ 0 400 400   'string'
+ 1 400 400   
+ 0 400 400   # dqstring=13
+ 0 400 400   "string"
+ 1 400 400   
+ 0 400 400   # operator=14
+ 0 400 400   +
+ 1 400 400   
+ 0 400 400   # function=15
+ 0 400 400   function()
+ 1 400 400   
+ 0 400 400   # identifier=16
+ 0 400 400   identifier
+ 1 400 400   
+ 0 400 400   # quotedidentifier=17
+ 0 400 400   `quoted`
+ 1 400 400   
+ 0 400 400   # user1=18
+ 0 400 400   user1
+ 1 400 400   
+ 0 400 400   # user2=19
+ 0 400 400   user2
+ 1 400 400   
+ 0 400 400   # user3=20
+ 0 400 400   user3
+ 1 400 400   
+ 0 400 400   # hiddencommand=21
+ 0 400 400   /*!*/
+ 1 400 400   
+ 0 400 400   # placeholder=22
+ 0 400 400   <{placeholder>}
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/mysql/AllStyles.sql.styled b/src/lexilla/test/examples/mysql/AllStyles.sql.styled
new file mode 100644
index 000000000..ec0205481
--- /dev/null
+++ b/src/lexilla/test/examples/mysql/AllStyles.sql.styled
@@ -0,0 +1,70 @@
+{2}-- Enumerate all styles: 0 to 22, except for 3 (variable) and 11 (string) which are not implemented
+-- Hidden commands with other states (ored with ox40) are also possible inside /*! ... */
+{0}
+{1}/* commentline=2 */{0}
+{2}# comment
+{0}
+{2}# default=0
+{0}	{2}# w
+{0}
+{2}# comment=1
+{1}/* comment */{0}
+
+{2}# variable=3 is not implemented
+{14}@{16}variable{0}
+
+{2}# systemvariable=4
+{4}@@systemvariable{0}
+
+{2}# knownsystemvariable=5
+{5}@@known{0}
+
+{2}# number=6
+{6}6{0}
+
+{2}# majorkeyword=7
+{7}select{0}
+
+{2}# keyword=8
+{8}in{0}
+
+{2}# databaseobject=9
+{9}object{0}
+
+{2}# procedurekeyword=10
+{10}procedure{0}
+
+{2}# string=11 is not implemented
+{0}
+{2}# sqstring=12
+{12}'string'{0}
+
+{2}# dqstring=13
+{13}"string"{0}
+
+{2}# operator=14
+{14}+{0}
+
+{2}# function=15
+{15}function{14}(){0}
+
+{2}# identifier=16
+{16}identifier{0}
+
+{2}# quotedidentifier=17
+{17}`quoted`{0}
+
+{2}# user1=18
+{18}user1{0}
+
+{2}# user2=19
+{19}user2{0}
+
+{2}# user3=20
+{20}user3{0}
+
+{2}# hiddencommand=21
+{21}/*!*/{0}
+
+{2}# placeholder=22
+{22}<{placeholder>}
diff --git a/src/lexilla/test/examples/mysql/SciTE.properties b/src/lexilla/test/examples/mysql/SciTE.properties
new file mode 100644
index 000000000..f6ee78114
--- /dev/null
+++ b/src/lexilla/test/examples/mysql/SciTE.properties
@@ -0,0 +1,18 @@
+lexer.*.sql=mysql
+
+keywords.*.sql=select
+keywords2.*.sql=in
+keywords3.*.sql=object
+keywords4.*.sql=function
+keywords5.*.sql=known
+keywords6.*.sql=procedure
+keywords7.*.sql=user1
+keywords8.*.sql=user2
+keywords9.*.sql=user3
+
+lexer.sql.backticks.identifier=1
+lexer.sql.numbersign.comment=1
+lexer.sql.allow.dotted.word=1
+
+fold=1
+fold.compact=1
diff --git a/src/lexilla/test/examples/python/strings.py b/src/lexilla/test/examples/python/strings.py
new file mode 100644
index 000000000..8576cb9d1
--- /dev/null
+++ b/src/lexilla/test/examples/python/strings.py
@@ -0,0 +1,16 @@
+# Simple raw string
+r''
+
+# Raw f-string
+rf''
+fr''
+
+# Raw byte string
+rb''
+br''
+
+# Raw unicode strings: ur'' is valid in 2.7 (but not in 3) -- always lexed as
+# valid; ru'' is never valid
+ru''
+ur''
+
diff --git a/src/lexilla/test/examples/python/strings.py.folded b/src/lexilla/test/examples/python/strings.py.folded
new file mode 100644
index 000000000..994f9609b
--- /dev/null
+++ b/src/lexilla/test/examples/python/strings.py.folded
@@ -0,0 +1,17 @@
+ 0 400   0   # Simple raw string
+ 0 400   0   r''
+ 1 400   0   
+ 0 400   0   # Raw f-string
+ 0 400   0   rf''
+ 0 400   0   fr''
+ 1 400   0   
+ 0 400   0   # Raw byte string
+ 0 400   0   rb''
+ 0 400   0   br''
+ 1 400   0   
+ 0 400   0   # Raw unicode strings: ur'' is valid in 2.7 (but not in 3) -- always lexed as
+ 0 400   0   # valid; ru'' is never valid
+ 0 400   0   ru''
+ 0 400   0   ur''
+ 1 400   0   
+ 1 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/python/strings.py.styled b/src/lexilla/test/examples/python/strings.py.styled
new file mode 100644
index 000000000..5b5d3cc61
--- /dev/null
+++ b/src/lexilla/test/examples/python/strings.py.styled
@@ -0,0 +1,16 @@
+{1}# Simple raw string{0}
+{4}r''{0}
+
+{1}# Raw f-string{0}
+{17}rf''{0}
+{17}fr''{0}
+
+{1}# Raw byte string{0}
+{4}rb''{0}
+{4}br''{0}
+
+{1}# Raw unicode strings: ur'' is valid in 2.7 (but not in 3) -- always lexed as{0}
+{1}# valid; ru'' is never valid{0}
+{11}ru{4}''{0}
+{4}ur''{0}
+
diff --git a/src/lexilla/test/examples/ruby/225NumberDotMethod.rb b/src/lexilla/test/examples/ruby/225NumberDotMethod.rb
new file mode 100644
index 000000000..97c4c43b9
--- /dev/null
+++ b/src/lexilla/test/examples/ruby/225NumberDotMethod.rb
@@ -0,0 +1,12 @@
+# Float Literals
+12.34
+1234e-2
+1.234E1
+# Range Literals
+(1..2)
+(2.0..3)
+# Method on number
+1.5.ceil
+1ri.abs
+3.times {|i| puts i}
+3. times {|i| puts i}
diff --git a/src/lexilla/test/examples/ruby/225NumberDotMethod.rb.folded b/src/lexilla/test/examples/ruby/225NumberDotMethod.rb.folded
new file mode 100644
index 000000000..6f2420867
--- /dev/null
+++ b/src/lexilla/test/examples/ruby/225NumberDotMethod.rb.folded
@@ -0,0 +1,13 @@
+ 0 400   0   # Float Literals
+ 0 400   0   12.34
+ 0 400   0   1234e-2
+ 0 400   0   1.234E1
+ 0 400   0   # Range Literals
+ 0 400   0   (1..2)
+ 0 400   0   (2.0..3)
+ 0 400   0   # Method on number
+ 0 400   0   1.5.ceil
+ 0 400   0   1ri.abs
+ 0 400   0   3.times {|i| puts i}
+ 0 400   0   3. times {|i| puts i}
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/ruby/225NumberDotMethod.rb.styled b/src/lexilla/test/examples/ruby/225NumberDotMethod.rb.styled
new file mode 100644
index 000000000..b1ecf323b
--- /dev/null
+++ b/src/lexilla/test/examples/ruby/225NumberDotMethod.rb.styled
@@ -0,0 +1,12 @@
+{2}# Float Literals{0}
+{4}12.34{0}
+{4}1234e{10}-{4}2{0}
+{4}1.234E1{0}
+{2}# Range Literals{0}
+{10}({4}1{10}..{4}2{10}){0}
+{10}({4}2.0{10}..{4}3{10}){0}
+{2}# Method on number{0}
+{4}1.5{10}.{11}ceil{0}
+{4}1ri{10}.{11}abs{0}
+{4}3{10}.{11}times{0} {10}{|{11}i{10}|{0} {11}puts{0} {11}i{10}}{0}
+{4}3{10}.{0} {11}times{0} {10}{|{11}i{10}|{0} {11}puts{0} {11}i{10}}{0}
diff --git a/src/lexilla/test/examples/ruby/234HereDoc.rb b/src/lexilla/test/examples/ruby/234HereDoc.rb
new file mode 100644
index 000000000..17bc8e11b
--- /dev/null
+++ b/src/lexilla/test/examples/ruby/234HereDoc.rb
@@ -0,0 +1,8 @@
+# encoding: utf-8
+puts <<A中
+#{1+2}
+A中
+
+puts <<中
+#{1+2}
+中
diff --git a/src/lexilla/test/examples/ruby/234HereDoc.rb.folded b/src/lexilla/test/examples/ruby/234HereDoc.rb.folded
new file mode 100644
index 000000000..815c8d124
--- /dev/null
+++ b/src/lexilla/test/examples/ruby/234HereDoc.rb.folded
@@ -0,0 +1,9 @@
+ 0 400   0   # encoding: utf-8
+ 2 400   0 + puts <<A中
+ 0 401   0 | #{1+2}
+ 0 401   0 | A中
+ 1 400   0   
+ 2 400   0 + puts <<中
+ 0 401   0 | #{1+2}
+ 0 401   0 | 中
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/ruby/234HereDoc.rb.styled b/src/lexilla/test/examples/ruby/234HereDoc.rb.styled
new file mode 100644
index 000000000..930d57f3e
--- /dev/null
+++ b/src/lexilla/test/examples/ruby/234HereDoc.rb.styled
@@ -0,0 +1,8 @@
+{2}# encoding: utf-8{0}
+{11}puts{0} {10}<<{20}A中{22}
+{10}#{{4}1{10}+{4}2{10}}{22}
+{20}A中{0}
+
+{11}puts{0} {10}<<{20}中{22}
+{10}#{{4}1{10}+{4}2{10}}{22}
+{20}中{0}
diff --git a/src/lexilla/test/examples/ruby/Issue67.rb b/src/lexilla/test/examples/ruby/Issue67.rb
index dcdb8c069..0a71ef7a7 100644
--- a/src/lexilla/test/examples/ruby/Issue67.rb
+++ b/src/lexilla/test/examples/ruby/Issue67.rb
@@ -11,3 +11,22 @@
 $stdout.puts <<~EOT.chomp
 	squiggly heredoc
 EOT
+
+# Issue #236: modifier if, unless, while and until
+alias error puts
+
+error <<EOF if true
+heredoc if true
+EOF
+
+error <<EOF unless false
+heredoc unless false
+EOF
+
+error <<EOF while false
+heredoc while false
+EOF
+
+error <<EOF until true
+heredoc until true
+EOF
diff --git a/src/lexilla/test/examples/ruby/Issue67.rb.folded b/src/lexilla/test/examples/ruby/Issue67.rb.folded
index 3dd08f6d9..3316b3f94 100644
--- a/src/lexilla/test/examples/ruby/Issue67.rb.folded
+++ b/src/lexilla/test/examples/ruby/Issue67.rb.folded
@@ -11,4 +11,23 @@
  2 400   0 + $stdout.puts <<~EOT.chomp
  0 401   0 | 	squiggly heredoc
  0 401   0 | EOT
+ 1 400   0   
+ 0 400   0   # Issue #236: modifier if, unless, while and until
+ 0 400   0   alias error puts
+ 1 400   0   
+ 2 400   0 + error <<EOF if true
+ 0 401   0 | heredoc if true
+ 0 401   0 | EOF
+ 1 400   0   
+ 2 400   0 + error <<EOF unless false
+ 0 401   0 | heredoc unless false
+ 0 401   0 | EOF
+ 1 400   0   
+ 2 400   0 + error <<EOF while false
+ 0 401   0 | heredoc while false
+ 0 401   0 | EOF
+ 1 400   0   
+ 2 400   0 + error <<EOF until true
+ 0 401   0 | heredoc until true
+ 0 401   0 | EOF
  0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/ruby/Issue67.rb.styled b/src/lexilla/test/examples/ruby/Issue67.rb.styled
index f3c13601b..0fb074fbe 100644
--- a/src/lexilla/test/examples/ruby/Issue67.rb.styled
+++ b/src/lexilla/test/examples/ruby/Issue67.rb.styled
@@ -11,3 +11,22 @@ content for heredoc one
 {13}$stdout{10}.{11}puts{0} {10}<<{20}~EOT{10}.{11}chomp{22}
 	squiggly heredoc
 {20}EOT{0}
+
+{2}# Issue #236: modifier if, unless, while and until{0}
+{11}alias{0} {11}error{0} {11}puts{0}
+
+{11}error{0} {10}<<{20}EOF{0} {29}if{0} {5}true{22}
+heredoc if true
+{20}EOF{0}
+
+{11}error{0} {10}<<{20}EOF{0} {29}unless{0} {5}false{22}
+heredoc unless false
+{20}EOF{0}
+
+{11}error{0} {10}<<{20}EOF{0} {29}while{0} {5}false{22}
+heredoc while false
+{20}EOF{0}
+
+{11}error{0} {10}<<{20}EOF{0} {29}until{0} {5}true{22}
+heredoc until true
+{20}EOF{0}
diff --git a/src/lexilla/test/examples/ruby/SciTE.properties b/src/lexilla/test/examples/ruby/SciTE.properties
index 69f7a3e3e..5693c0efb 100644
--- a/src/lexilla/test/examples/ruby/SciTE.properties
+++ b/src/lexilla/test/examples/ruby/SciTE.properties
@@ -1,4 +1,4 @@
 lexer.*.rb=ruby
-keywords.*.rb=begin class def do end false if module return self super true while \
+keywords.*.rb=begin class def do end false if module return self super true unless until while \
 __FILE__ __LINE__
 fold=1
diff --git a/src/lexilla/test/examples/rust/Issue239.rs b/src/lexilla/test/examples/rust/Issue239.rs
new file mode 100644
index 000000000..510611653
--- /dev/null
+++ b/src/lexilla/test/examples/rust/Issue239.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let r#true = false;
+    println!("{}", r#true);
+}
\ No newline at end of file
diff --git a/src/lexilla/test/examples/rust/Issue239.rs.folded b/src/lexilla/test/examples/rust/Issue239.rs.folded
new file mode 100644
index 000000000..07837eaee
--- /dev/null
+++ b/src/lexilla/test/examples/rust/Issue239.rs.folded
@@ -0,0 +1,4 @@
+ 2 400 401 + fn main() {
+ 0 401 401 |     let r#true = false;
+ 0 401 401 |     println!("{}", r#true);
+ 0 401 400 | }
\ No newline at end of file
diff --git a/src/lexilla/test/examples/rust/Issue239.rs.styled b/src/lexilla/test/examples/rust/Issue239.rs.styled
new file mode 100644
index 000000000..9fbb52244
--- /dev/null
+++ b/src/lexilla/test/examples/rust/Issue239.rs.styled
@@ -0,0 +1,4 @@
+{6}fn{0} {17}main{16}(){0} {16}{{0}
+    {6}let{0} {17}r#true{0} {16}={0} {6}false{16};{0}
+    {19}println!{16}({13}"{}"{16},{0} {17}r#true{16});{0}
+{16}}
\ No newline at end of file
diff --git a/src/lexilla/test/examples/sql/AllStyles.sql b/src/lexilla/test/examples/sql/AllStyles.sql
new file mode 100644
index 000000000..d8121d1eb
--- /dev/null
+++ b/src/lexilla/test/examples/sql/AllStyles.sql
@@ -0,0 +1,70 @@
+-- Enumerate all styles: 0 to 24
+
+-- comment=1
+/* comment */
+
+-- whitespace=0
+	-- w
+
+/* commentline=2 */
+-- commentline
+
+-- commentdoc=3
+/** commentdoc */
+
+-- number=4
+4
+
+-- word=5
+select
+
+-- string=6
+"string"
+
+-- character=7
+'character'
+
+-- sqlplus=8
+append
+
+-- sqlplus_prompt=9
+prompt SQL+Prompt
+
+-- operator=10
++
+
+-- identifier=11
+identifier
+
+-- sqlplus_comment=13
+remark sqlplus comment
+
+-- commentlinedoc=15
+# commentlinedoc
+
+-- word2=16
+object
+
+-- commentdockeyword=17
+/** @return */
+
+-- commentdockeyworderror=18
+/** @error */
+
+-- user1=19
+dbms_output.disable
+
+-- user2=20
+analyze
+
+-- user3=21
+array
+
+-- user4=22
+false
+
+-- quotedidentifier=23
+`quotedidentifier`
+
+-- qoperator=24
+q'{ today's }'
diff --git a/src/lexilla/test/examples/sql/AllStyles.sql.folded b/src/lexilla/test/examples/sql/AllStyles.sql.folded
new file mode 100644
index 000000000..53b15868a
--- /dev/null
+++ b/src/lexilla/test/examples/sql/AllStyles.sql.folded
@@ -0,0 +1,71 @@
+ 0 400 400   -- Enumerate all styles: 0 to 24
+ 1 400 400   
+ 0 400 400   -- comment=1
+ 0 400 400   /* comment */
+ 1 400 400   
+ 0 400 400   -- whitespace=0
+ 0 400 400   	-- w
+ 1 400 400   
+ 0 400 400   /* commentline=2 */
+ 0 400 400   -- commentline
+ 1 400 400   
+ 0 400 400   -- commentdoc=3
+ 0 400 400   /** commentdoc */
+ 1 400 400   
+ 0 400 400   -- number=4
+ 0 400 400   4
+ 1 400 400   
+ 0 400 400   -- word=5
+ 0 400 400   select
+ 1 400 400   
+ 0 400 400   -- string=6
+ 0 400 400   "string"
+ 1 400 400   
+ 0 400 400   -- character=7
+ 0 400 400   'character'
+ 1 400 400   
+ 0 400 400   -- sqlplus=8
+ 0 400 400   append
+ 1 400 400   
+ 0 400 400   -- sqlplus_prompt=9
+ 0 400 400   prompt SQL+Prompt
+ 1 400 400   
+ 0 400 400   -- operator=10
+ 0 400 400   +
+ 1 400 400   
+ 0 400 400   -- identifier=11
+ 0 400 400   identifier
+ 1 400 400   
+ 0 400 400   -- sqlplus_comment=13
+ 0 400 400   remark sqlplus comment
+ 1 400 400   
+ 0 400 400   -- commentlinedoc=15
+ 0 400 400   # commentlinedoc
+ 1 400 400   
+ 0 400 400   -- word2=16
+ 0 400 400   object
+ 1 400 400   
+ 0 400 400   -- commentdockeyword=17
+ 0 400 400   /** @return */
+ 1 400 400   
+ 0 400 400   -- commentdockeyworderror=18
+ 0 400 400   /** @error */
+ 1 400 400   
+ 0 400 400   -- user1=19
+ 0 400 400   dbms_output.disable
+ 1 400 400   
+ 0 400 400   -- user2=20
+ 0 400 400   analyze
+ 1 400 400   
+ 0 400 400   -- user3=21
+ 0 400 400   array
+ 1 400 400   
+ 0 400 400   -- user4=22
+ 0 400 400   false
+ 1 400 400   
+ 0 400 400   -- quotedidentifier=23
+ 0 400 400   `quotedidentifier`
+ 1 400 400   
+ 0 400 400   -- qoperator=24
+ 0 400 400   q'{ today's }'
+ 0 400   0   
\ No newline at end of file
diff --git a/src/lexilla/test/examples/sql/AllStyles.sql.styled b/src/lexilla/test/examples/sql/AllStyles.sql.styled
new file mode 100644
index 000000000..35b4334da
--- /dev/null
+++ b/src/lexilla/test/examples/sql/AllStyles.sql.styled
@@ -0,0 +1,70 @@
+{2}-- Enumerate all styles: 0 to 24
+{0}
+{2}-- comment=1
+{1}/* comment */{0}
+
+{2}-- whitespace=0
+{0}	{2}-- w
+{0}
+{1}/* commentline=2 */{0}
+{2}-- commentline
+{0}
+{2}-- commentdoc=3
+{3}/** commentdoc */{0}
+
+{2}-- number=4
+{4}4{0}
+
+{2}-- word=5
+{5}select{0}
+
+{2}-- string=6
+{6}"string"{0}
+
+{2}-- character=7
+{7}'character'{0}
+
+{2}-- sqlplus=8
+{8}append{0}
+
+{2}-- sqlplus_prompt=9
+{8}prompt{9} SQL+Prompt
+{0}
+{2}-- operator=10
+{10}+{0}
+
+{2}-- identifier=11
+{11}identifier{0}
+
+{2}-- sqlplus_comment=13
+{8}remark{13} sqlplus comment
+{0}
+{2}-- commentlinedoc=15
+{15}# commentlinedoc
+{0}
+{2}-- word2=16
+{16}object{0}
+
+{2}-- commentdockeyword=17
+{3}/** {17}@return{3} */{0}
+
+{2}-- commentdockeyworderror=18
+{3}/** {18}@error{3} */{0}
+
+{2}-- user1=19
+{19}dbms_output.disable{0}
+
+{2}-- user2=20
+{20}analyze{0}
+
+{2}-- user3=21
+{21}array{0}
+
+{2}-- user4=22
+{22}false{0}
+
+{2}-- quotedidentifier=23
+{23}`quotedidentifier`{0}
+
+{2}-- qoperator=24
+{24}q'{ today's }'{0}
diff --git a/src/lexilla/test/examples/sql/SciTE.properties b/src/lexilla/test/examples/sql/SciTE.properties
new file mode 100644
index 000000000..e3bc62c90
--- /dev/null
+++ b/src/lexilla/test/examples/sql/SciTE.properties
@@ -0,0 +1,17 @@
+lexer.*.sql=sql
+
+keywords.*.sql=select
+keywords2.*.sql=object
+keywords3.*.sql=return
+keywords4.*.sql=a~ppend pro~mpt rem~ark
+keywords5.*.sql=dbms_output.disable
+keywords6.*.sql=analyze
+keywords7.*.sql=array
+keywords8.*.sql=false
+
+lexer.sql.backticks.identifier=1
+lexer.sql.numbersign.comment=1
+lexer.sql.allow.dotted.word=1
+
+fold=1
+fold.compact=1
diff --git a/src/lexilla/test/unit/UnitTester.vcxproj b/src/lexilla/test/unit/UnitTester.vcxproj
index 48df9678a..97b14b54d 100644
--- a/src/lexilla/test/unit/UnitTester.vcxproj
+++ b/src/lexilla/test/unit/UnitTester.vcxproj
@@ -152,6 +152,7 @@
   <ItemGroup>
     <ClCompile Include="..\..\lexlib\Accessor.cxx" />
     <ClCompile Include="..\..\lexlib\CharacterSet.cxx" />
+    <ClCompile Include="..\..\lexlib\InList.cxx" />
     <ClCompile Include="..\..\lexlib\LexerBase.cxx" />
     <ClCompile Include="..\..\lexlib\LexerModule.cxx" />
     <ClCompile Include="..\..\lexlib\LexerSimple.cxx" />
diff --git a/src/lexilla/test/unit/catch.hpp b/src/lexilla/test/unit/catch.hpp
index 7e706f947..9b309bddc 100644
--- a/src/lexilla/test/unit/catch.hpp
+++ b/src/lexilla/test/unit/catch.hpp
@@ -1,9 +1,9 @@
 /*
- *  Catch v2.13.7
- *  Generated: 2021-07-28 20:29:27.753164
+ *  Catch v2.13.10
+ *  Generated: 2022-10-16 11:01:23.452308
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
- *  Copyright (c) 2021 Two Blue Cubes Ltd. All rights reserved.
+ *  Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
  *
  *  Distributed under the Boost Software License, Version 1.0. (See accompanying
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -15,7 +15,7 @@
 
 #define CATCH_VERSION_MAJOR 2
 #define CATCH_VERSION_MINOR 13
-#define CATCH_VERSION_PATCH 7
+#define CATCH_VERSION_PATCH 10
 
 #ifdef __clang__
 #    pragma clang system_header
@@ -240,9 +240,6 @@ namespace Catch {
 // Visual C++
 #if defined(_MSC_VER)
 
-#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
-#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
-
 // Universal Windows platform does not support SEH
 // Or console colours (or console at all...)
 #  if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
@@ -251,13 +248,18 @@ namespace Catch {
 #    define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
 #  endif
 
+#  if !defined(__clang__) // Handle Clang masquerading for msvc
+
 // MSVC traditional preprocessor needs some workaround for __VA_ARGS__
 // _MSVC_TRADITIONAL == 0 means new conformant preprocessor
 // _MSVC_TRADITIONAL == 1 means old traditional non-conformant preprocessor
-#  if !defined(__clang__) // Handle Clang masquerading for msvc
 #    if !defined(_MSVC_TRADITIONAL) || (defined(_MSVC_TRADITIONAL) && _MSVC_TRADITIONAL)
 #      define CATCH_INTERNAL_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
 #    endif // MSVC_TRADITIONAL
+
+// Only do this if we're not using clang on Windows, which uses `diagnostic push` & `diagnostic pop`
+#    define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION __pragma( warning(push) )
+#    define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  __pragma( warning(pop) )
 #  endif // __clang__
 
 #endif // _MSC_VER
@@ -1010,34 +1012,34 @@ struct AutoReg : NonCopyable {
 
     #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
         #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
     #else
         #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(Name, Tags, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
     #endif
 
     #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
         #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
     #else
         #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG_NO_REGISTRATION(Name, Tags, Signature, ...) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
     #endif
 
     #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
         #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
     #else
         #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION( ClassName, Name, Tags,... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
     #endif
 
     #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
         #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+            INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
     #else
         #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG_NO_REGISTRATION( ClassName, Name, Tags, Signature, ... ) \
-            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+            INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_NO_REGISTRATION_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
     #endif
 #endif
 
@@ -1050,7 +1052,7 @@ struct AutoReg : NonCopyable {
         CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
         static void TestName()
     #define INTERNAL_CATCH_TESTCASE( ... ) \
-        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), __VA_ARGS__ )
 
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
@@ -1072,7 +1074,7 @@ struct AutoReg : NonCopyable {
         CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION \
         void TestName::test()
     #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
-        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), ClassName, __VA_ARGS__ )
 
     ///////////////////////////////////////////////////////////////////////////////
     #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
@@ -1113,18 +1115,18 @@ struct AutoReg : NonCopyable {
 
 #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
     #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ )
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ )
 #else
     #define INTERNAL_CATCH_TEMPLATE_TEST_CASE(Name, Tags, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename TestType, __VA_ARGS__ ) )
 #endif
 
 #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
     #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ )
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ )
 #else
     #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_SIG(Name, Tags, Signature, ...) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
 #endif
 
     #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(TestName, TestFuncName, Name, Tags, Signature, TmplTypes, TypesList) \
@@ -1162,18 +1164,18 @@ struct AutoReg : NonCopyable {
 
 #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
     #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T,__VA_ARGS__)
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T,__VA_ARGS__)
 #else
     #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE(Name, Tags, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, typename T, __VA_ARGS__ ) )
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, typename T, __VA_ARGS__ ) )
 #endif
 
 #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
     #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__)
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__)
 #else
     #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_SIG(Name, Tags, Signature, ...)\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, Signature, __VA_ARGS__ ) )
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, Signature, __VA_ARGS__ ) )
 #endif
 
     #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2(TestName, TestFunc, Name, Tags, TmplList)\
@@ -1204,7 +1206,7 @@ struct AutoReg : NonCopyable {
         static void TestFunc()
 
     #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE(Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), Name, Tags, TmplList )
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), Name, Tags, TmplList )
 
     #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, Signature, ... ) \
         CATCH_INTERNAL_START_WARNINGS_SUPPRESSION \
@@ -1237,18 +1239,18 @@ struct AutoReg : NonCopyable {
 
 #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
     #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ )
 #else
     #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD( ClassName, Name, Tags,... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, typename T, __VA_ARGS__ ) )
 #endif
 
 #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
     #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
+        INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ )
 #else
     #define INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... ) \
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____C_L_A_S_S____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_C_L_A_S_S_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ) , ClassName, Name, Tags, Signature, __VA_ARGS__ ) )
 #endif
 
     #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2(TestNameClass, TestName, ClassName, Name, Tags, Signature, TmplTypes, TypesList)\
@@ -1289,18 +1291,18 @@ struct AutoReg : NonCopyable {
 
 #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
     #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T, __VA_ARGS__ )
 #else
     #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD( ClassName, Name, Tags, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, typename T,__VA_ARGS__ ) )
 #endif
 
 #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
     #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
+        INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature, __VA_ARGS__ )
 #else
     #define INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG( ClassName, Name, Tags, Signature, ... )\
-        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
+        INTERNAL_CATCH_EXPAND_VARGS( INTERNAL_CATCH_TEMPLATE_PRODUCT_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, Signature,__VA_ARGS__ ) )
 #endif
 
     #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( TestNameClass, TestName, ClassName, Name, Tags, TmplList) \
@@ -1334,7 +1336,7 @@ struct AutoReg : NonCopyable {
         void TestName<TestType>::test()
 
 #define INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD(ClassName, Name, Tags, TmplList) \
-        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____ ), INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_M_P_L_A_T_E____T_E_S_T____F_U_N_C____ ), ClassName, Name, Tags, TmplList )
+        INTERNAL_CATCH_TEMPLATE_LIST_TEST_CASE_METHOD_2( INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_ ), INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_M_P_L_A_T_E_T_E_S_T_F_U_N_C_ ), ClassName, Name, Tags, TmplList )
 
 // end catch_test_registry.h
 // start catch_capture.hpp
@@ -3091,7 +3093,7 @@ namespace Detail {
         Approx operator-() const;
 
         template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
-        Approx operator()( T const& value ) {
+        Approx operator()( T const& value ) const {
             Approx approx( static_cast<double>(value) );
             approx.m_epsilon = m_epsilon;
             approx.m_margin = m_margin;
@@ -4163,7 +4165,7 @@ namespace Generators {
             if (!m_predicate(m_generator.get())) {
                 // It might happen that there are no values that pass the
                 // filter. In that case we throw an exception.
-                auto has_initial_value = next();
+                auto has_initial_value = nextImpl();
                 if (!has_initial_value) {
                     Catch::throw_exception(GeneratorException("No valid value found in filtered generator"));
                 }
@@ -4175,6 +4177,11 @@ namespace Generators {
         }
 
         bool next() override {
+            return nextImpl();
+        }
+
+    private:
+        bool nextImpl() {
             bool success = m_generator.next();
             if (!success) {
                 return false;
@@ -7388,8 +7395,6 @@ namespace Catch {
             template <typename T, bool Destruct>
             struct ObjectStorage
             {
-                using TStorage = typename std::aligned_storage<sizeof(T), std::alignment_of<T>::value>::type;
-
                 ObjectStorage() : data() {}
 
                 ObjectStorage(const ObjectStorage& other)
@@ -7432,7 +7437,7 @@ namespace Catch {
                     return *static_cast<T*>(static_cast<void*>(&data));
                 }
 
-                TStorage data;
+                struct { alignas(T) unsigned char data[sizeof(T)]; }  data;
             };
         }
 
@@ -7942,7 +7947,7 @@ namespace Catch {
     #if defined(__i386__) || defined(__x86_64__)
         #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
     #elif defined(__aarch64__)
-        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+        #define CATCH_TRAP()  __asm__(".inst 0xd43e0000")
     #endif
 
 #elif defined(CATCH_PLATFORM_IPHONE)
@@ -13385,6 +13390,10 @@ namespace Catch {
                     filename.erase(0, lastSlash);
                     filename[0] = '#';
                 }
+                else
+                {
+                    filename.insert(0, "#");
+                }
 
                 auto lastDot = filename.find_last_of('.');
                 if (lastDot != std::string::npos) {
@@ -13547,7 +13556,7 @@ namespace Catch {
 
             // Handle list request
             if( Option<std::size_t> listed = list( m_config ) )
-                return static_cast<int>( *listed );
+                return (std::min) (MaxExitCode, static_cast<int>(*listed));
 
             TestGroup tests { m_config };
             auto const totals = tests.execute();
@@ -15380,7 +15389,7 @@ namespace Catch {
     }
 
     Version const& libraryVersion() {
-        static Version version( 2, 13, 7, "", 0 );
+        static Version version( 2, 13, 10, "", 0 );
         return version;
     }
 
@@ -17515,12 +17524,20 @@ namespace Catch {
 
 #ifndef __OBJC__
 
+#ifndef CATCH_INTERNAL_CDECL
+#ifdef _MSC_VER
+#define CATCH_INTERNAL_CDECL __cdecl
+#else
+#define CATCH_INTERNAL_CDECL
+#endif
+#endif
+
 #if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
 // Standard C/C++ Win32 Unicode wmain entry point
-extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+extern "C" int CATCH_INTERNAL_CDECL wmain (int argc, wchar_t * argv[], wchar_t * []) {
 #else
 // Standard C/C++ main entry point
-int main (int argc, char * argv[]) {
+int CATCH_INTERNAL_CDECL main (int argc, char * argv[]) {
 #endif
 
     return Catch::Session().run( argc, argv );
@@ -17648,9 +17665,9 @@ int main (int argc, char * const argv[]) {
 
 #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
 #define CATCH_BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
 #define CATCH_BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
 #endif // CATCH_CONFIG_ENABLE_BENCHMARKING
 
 // If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
@@ -17752,9 +17769,9 @@ int main (int argc, char * const argv[]) {
 
 #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
 #define BENCHMARK(...) \
-    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
+    INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
 #define BENCHMARK_ADVANCED(name) \
-    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(____C_A_T_C_H____B_E_N_C_H____), name)
+    INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(C_A_T_C_H_B_E_N_C_H_), name)
 #endif // CATCH_CONFIG_ENABLE_BENCHMARKING
 
 using Catch::Detail::Approx;
@@ -17801,8 +17818,8 @@ using Catch::Detail::Approx;
 #define CATCH_WARN( msg )          (void)(0)
 #define CATCH_CAPTURE( msg )       (void)(0)
 
-#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+#define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
 #define CATCH_METHOD_AS_TEST_CASE( method, ... )
 #define CATCH_REGISTER_TEST_CASE( Function, ... ) (void)(0)
 #define CATCH_SECTION( ... )
@@ -17811,7 +17828,7 @@ using Catch::Detail::Approx;
 #define CATCH_FAIL_CHECK( ... ) (void)(0)
 #define CATCH_SUCCEED( ... ) (void)(0)
 
-#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
 
 #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
 #define CATCH_TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
@@ -17834,8 +17851,8 @@ using Catch::Detail::Approx;
 #endif
 
 // "BDD-style" convenience wrappers
-#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+#define CATCH_SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
 #define CATCH_GIVEN( desc )
 #define CATCH_AND_GIVEN( desc )
 #define CATCH_WHEN( desc )
@@ -17883,10 +17900,10 @@ using Catch::Detail::Approx;
 #define INFO( msg ) (void)(0)
 #define UNSCOPED_INFO( msg ) (void)(0)
 #define WARN( msg ) (void)(0)
-#define CAPTURE( msg ) (void)(0)
+#define CAPTURE( ... ) (void)(0)
 
-#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
-#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define TEST_CASE( ... )  INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
 #define METHOD_AS_TEST_CASE( method, ... )
 #define REGISTER_TEST_CASE( Function, ... ) (void)(0)
 #define SECTION( ... )
@@ -17894,7 +17911,7 @@ using Catch::Detail::Approx;
 #define FAIL( ... ) (void)(0)
 #define FAIL_CHECK( ... ) (void)(0)
 #define SUCCEED( ... ) (void)(0)
-#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ))
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
 
 #ifndef CATCH_CONFIG_TRADITIONAL_MSVC_PREPROCESSOR
 #define TEMPLATE_TEST_CASE( ... ) INTERNAL_CATCH_TEMPLATE_TEST_CASE_NO_REGISTRATION(__VA_ARGS__)
@@ -17924,8 +17941,8 @@ using Catch::Detail::Approx;
 #define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION_NO_REG( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
 
 // "BDD-style" convenience wrappers
-#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ) )
-#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), className )
+#define SCENARIO( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ) )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_METHOD_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ), className )
 
 #define GIVEN( desc )
 #define AND_GIVEN( desc )
diff --git a/src/lexilla/test/unit/test.mak b/src/lexilla/test/unit/test.mak
index 5e5165c6d..ef63efb93 100644
--- a/src/lexilla/test/unit/test.mak
+++ b/src/lexilla/test/unit/test.mak
@@ -14,6 +14,7 @@ TESTSRC=test*.cxx
 TESTEDSRC=\
  ../../lexlib/Accessor.cxx \
  ../../lexlib/CharacterSet.cxx \
+ ../../lexlib/InList.cxx \
  ../../lexlib/LexerBase.cxx \
  ../../lexlib/LexerModule.cxx \
  ../../lexlib/LexerSimple.cxx \
diff --git a/src/lexilla/test/unit/testCharacterSet.cxx b/src/lexilla/test/unit/testCharacterSet.cxx
index 2b85cde2b..009c95059 100644
--- a/src/lexilla/test/unit/testCharacterSet.cxx
+++ b/src/lexilla/test/unit/testCharacterSet.cxx
@@ -5,6 +5,8 @@
 #include <cstdlib>
 #include <cassert>
 
+#include <string_view>
+
 #include "CharacterSet.h"
 
 #include "catch.hpp"
@@ -138,4 +140,12 @@ TEST_CASE("Functions") {
 		REQUIRE(CompareNCaseInsensitive("aa", "A", 1) == 0);
 	}
 
-}
\ No newline at end of file
+	SECTION("EqualCaseInsensitive") {
+		REQUIRE(EqualCaseInsensitive(" ", " "));
+		REQUIRE(EqualCaseInsensitive("A", "A"));
+		REQUIRE(EqualCaseInsensitive("a", "A"));
+		REQUIRE(!EqualCaseInsensitive("b", "A"));
+		REQUIRE(!EqualCaseInsensitive("aa", "A"));
+		REQUIRE(!EqualCaseInsensitive("a", "AA"));
+	}
+}
diff --git a/src/lexilla/test/unit/testInList.cxx b/src/lexilla/test/unit/testInList.cxx
new file mode 100644
index 000000000..6aa5e361d
--- /dev/null
+++ b/src/lexilla/test/unit/testInList.cxx
@@ -0,0 +1,28 @@
+/** @file testInList.cxx
+ ** Unit Tests for Lexilla internal data structures
+ **/
+
+#include <cstdlib>
+#include <cassert>
+
+#include <string_view>
+#include <initializer_list>
+
+#include "InList.h"
+
+#include "catch.hpp"
+
+using namespace Lexilla;
+
+// Test InList.
+
+TEST_CASE("InList") {
+
+	SECTION("Basic") {
+		REQUIRE(InList("dog", {"cat", "dog", "frog"}));
+		REQUIRE(!InList("fly", {"cat", "dog", "frog"}));
+
+		REQUIRE(InListCaseInsensitive("DOG", {"cat", "dog", "frog"}));
+		REQUIRE(!InListCaseInsensitive("fly", {"cat", "dog", "frog"}));
+	}
+}
diff --git a/src/lexilla/version.txt b/src/lexilla/version.txt
index f520b6ed4..2b9f7e853 100644
--- a/src/lexilla/version.txt
+++ b/src/lexilla/version.txt
@@ -1 +1 @@
-530
\ No newline at end of file
+532
\ No newline at end of file