diff --git a/PowerEditor/scintilla.original.forUpdating/lexilla522.zip b/PowerEditor/scintilla.original.forUpdating/lexilla524.zip
similarity index 67%
rename from PowerEditor/scintilla.original.forUpdating/lexilla522.zip
rename to PowerEditor/scintilla.original.forUpdating/lexilla524.zip
index 0aba46041..6328b7117 100644
Binary files a/PowerEditor/scintilla.original.forUpdating/lexilla522.zip and b/PowerEditor/scintilla.original.forUpdating/lexilla524.zip differ
diff --git a/PowerEditor/scintilla.original.forUpdating/scintilla533.zip b/PowerEditor/scintilla.original.forUpdating/scintilla534.zip
similarity index 68%
rename from PowerEditor/scintilla.original.forUpdating/scintilla533.zip
rename to PowerEditor/scintilla.original.forUpdating/scintilla534.zip
index 0d78e0155..02bfd207c 100644
Binary files a/PowerEditor/scintilla.original.forUpdating/scintilla533.zip and b/PowerEditor/scintilla.original.forUpdating/scintilla534.zip differ
diff --git a/lexilla/.gitattributes b/lexilla/.gitattributes
index dab975b0f..78e1cd116 100644
--- a/lexilla/.gitattributes
+++ b/lexilla/.gitattributes
@@ -29,6 +29,7 @@
 **.vb text
 **.cmake text
 **.d text
+**.diff text
 **.erl text
 **.gd text
 **.gui text
diff --git a/lexilla/cppcheck.suppress b/lexilla/cppcheck.suppress
index 352e5bb38..e17438c0c 100644
--- a/lexilla/cppcheck.suppress
+++ b/lexilla/cppcheck.suppress
@@ -61,7 +61,6 @@ unreadVariable:lexilla/lexers/LexJulia.cxx
 variableScope:lexilla/lexers/LexJulia.cxx
 variableScope:lexilla/lexers/LexLaTeX.cxx
 constParameter:lexilla/lexers/LexLaTeX.cxx
-constParameter:lexilla/lexers/LexLisp.cxx
 constParameter:lexilla/lexers/LexMagik.cxx
 constParameter:lexilla/lexers/LexMatlab.cxx
 unreadVariable:lexilla/lexers/LexMatlab.cxx
@@ -89,8 +88,8 @@ constParameter:lexilla/lexers/LexRaku.cxx
 variableScope:lexilla/lexers/LexRaku.cxx
 redundantInitialization:lexilla/lexers/LexRegistry.cxx
 constParameter:lexilla/lexers/LexRuby.cxx
+knownConditionTrueFalse:lexilla/lexers/LexRuby.cxx
 constParameter:lexilla/lexers/LexRust.cxx
-constParameter:lexilla/lexers/LexScriptol.cxx
 knownConditionTrueFalse:lexilla/lexers/LexScriptol.cxx
 variableScope:lexilla/lexers/LexSpecman.cxx
 unreadVariable:lexilla/lexers/LexSpice.cxx
@@ -127,30 +126,12 @@ constParameterCallback:lexilla/lexers/LexPython.cxx
 constParameterCallback:lexilla/lexers/LexScriptol.cxx
 constParameterCallback:lexilla/lexers/LexVB.cxx
 
-constVariable:lexilla/lexers/LexA68k.cxx
-constVariable:lexilla/lexers/LexAsn1.cxx
-constVariable:lexilla/lexers/LexCLW.cxx
-constVariable:lexilla/lexers/LexCOBOL.cxx
 constVariable:lexilla/lexers/LexCSS.cxx
 constVariable:lexilla/lexers/LexCrontab.cxx
-constVariable:lexilla/lexers/LexEScript.cxx
-constVariable:lexilla/lexers/LexEiffel.cxx
-constVariable:lexilla/lexers/LexForth.cxx
 constVariable:lexilla/lexers/LexGui4Cli.cxx
 constVariable:lexilla/lexers/LexKix.cxx
-constVariable:lexilla/lexers/LexLout.cxx
 constVariable:lexilla/lexers/LexMetapost.cxx
-constVariable:lexilla/lexers/LexModula.cxx
 constVariable:lexilla/lexers/LexOpal.cxx
-constVariable:lexilla/lexers/LexPS.cxx
-constVariable:lexilla/lexers/LexPascal.cxx
-constVariable:lexilla/lexers/LexRebol.cxx
-constVariable:lexilla/lexers/LexRuby.cxx
-constVariable:lexilla/lexers/LexSorcus.cxx
-constVariable:lexilla/lexers/LexStata.cxx
-constVariable:lexilla/lexers/LexTACL.cxx
-constVariable:lexilla/lexers/LexTADS3.cxx
-constVariable:lexilla/lexers/LexTAL.cxx
 
 // cppcheck appears wrong as atKeyPath must be remembered between loops
 variableScope:lexilla/lexers/LexRegistry.cxx
diff --git a/lexilla/doc/Lexilla.html b/lexilla/doc/Lexilla.html
index 904cdbc44..c5b06db86 100644
--- a/lexilla/doc/Lexilla.html
+++ b/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="20230208" />
+    <meta name="Date.Modified" content="20230313" />
     <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.2.2<br />
-           Site last modified February 8 2023</font>
+          <font color="#FFCC99" size="3">Release version 5.2.4<br />
+           Site last modified March 13 2023</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -77,13 +77,13 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.2.4 improves C++ and GDScript.</li>
+      <li>Version 5.2.3 improves Makefile, Ruby, and YAML.</li>
       <li>Version 5.2.2 improves C++, Matlab, Modula-3, Python, and X12.</li>
       <li>Version 5.2.1 improves Batch, F#, Markdown, and PowerShell.</li>
       <li>Version 5.2.0 improves PowerShell and R.</li>
       <li>Version 5.1.9 improves Julia and Properties.</li>
       <li>Version 5.1.8 improves F#, MS SQL, PowerShell, and Visual Prolog.</li>
-      <li>Version 5.1.7 improves CMake, HTML, Matlab, Raku, Ruby, and VHDL.</li>
-      <li>Version 5.1.6 improves Markdown and Ruby.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/lexilla/doc/LexillaDownload.html b/lexilla/doc/LexillaDownload.html
index efecff8d0..f25dad73e 100644
--- a/lexilla/doc/LexillaDownload.html
+++ b/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/lexilla522.zip">
+          <font size="4"> <a href="https://www.scintilla.org/lexilla524.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/lexilla522.tgz">
+	<a href="https://www.scintilla.org/lexilla524.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.2.2
+       Release 5.2.4
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@
        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/lexilla522.zip">zip format</a> (1.2M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/lexilla522.tgz">tgz format</a> (0.9M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/lexilla524.zip">zip format</a> (1.2M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/lexilla524.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/lexilla/doc/LexillaHistory.html b/lexilla/doc/LexillaHistory.html
index 3f2064a1f..17f1678ac 100644
--- a/lexilla/doc/LexillaHistory.html
+++ b/lexilla/doc/LexillaHistory.html
@@ -585,6 +585,79 @@
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla524.zip">Release 5.2.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 13 March 2023.
+	</li>
+	<li>
+	C++: Fix failure to recognize keywords containing upper case.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/149">Issue #149</a>.
+	</li>
+	<li>
+	GDScript: Support % and $ node paths.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/145">Issue #145</a>,
+	<a href="https://github.com/ScintillaOrg/lexilla/pull/146">Pull request #146</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="https://www.scintilla.org/lexilla523.zip">Release 5.2.3</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 March 2023.
+	</li>
+	<li>
+	Add scripts/PromoteNew.bat script to promote .new files after checking.
+	</li>
+	<li>
+	Makefile: Remove 1024-byte line length limit..
+	</li>
+	<li>
+	Ruby: Add new lexical classes for % literals SCE_RB_STRING_W (%w non-interpolable string array),
+	SCE_RB_STRING_I (%i non-interpolable symbol array),
+	SCE_RB_STRING_QI (%I interpolable symbol array),
+	and SCE_RB_STRING_QS (%s symbol).
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/124">Issue #124</a>.
+	</li>
+	<li>
+	Ruby: Disambiguate %= which may be a quote or modulo assignment.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/124">Issue #124</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/1255/">Bug #1255</a>,
+	<a href="https://sourceforge.net/p/scintilla/bugs/2182/">Bug #2182</a>.
+	</li>
+	<li>
+	Ruby: Fix additional fold level for single character in SCE_RB_STRING_QW.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/132">Issue #132</a>.
+	</li>
+	<li>
+	Ruby: Set SCE_RB_HERE_QQ for unquoted and double-quoted heredocs and
+	SCE_RB_HERE_QX for backticks-quoted heredocs.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/134">Issue #134</a>.
+	</li>
+	<li>
+	Ruby: Recognise #{} inside SCE_RB_HERE_QQ and SCE_RB_HERE_QX.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/134">Issue #134</a>.
+	</li>
+	<li>
+	Ruby: Improve regex and heredoc recognition.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/136">Issue #136</a>.
+	</li>
+	<li>
+	Ruby: Highlight #@, #@@ and #$ style interpolation.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/140">Issue #140</a>.
+	</li>
+	<li>
+	Ruby: Fix folding for multiple heredocs started on one line.
+	Fix folding when there is a space after heredoc opening delimiter.
+	<a href="https://github.com/ScintillaOrg/lexilla/issues/135">Issue #135</a>.
+	</li>
+	<li>
+	YAML: Remove 1024-byte line length limit.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/lexilla522.zip">Release 5.2.2</a>
     </h3>
diff --git a/lexilla/include/LexicalStyles.iface b/lexilla/include/LexicalStyles.iface
index f2d512dc3..59df61741 100644
--- a/lexilla/include/LexicalStyles.iface
+++ b/lexilla/include/LexicalStyles.iface
@@ -467,7 +467,11 @@ val SCE_RB_WORD_DEMOTED=29
 val SCE_RB_STDIN=30
 val SCE_RB_STDOUT=31
 val SCE_RB_STDERR=40
-val SCE_RB_UPPER_BOUND=41
+val SCE_RB_STRING_W=41
+val SCE_RB_STRING_I=42
+val SCE_RB_STRING_QI=43
+val SCE_RB_STRING_QS=44
+val SCE_RB_UPPER_BOUND=45
 # Lexical states for SCLEX_VB, SCLEX_VBSCRIPT, SCLEX_POWERBASIC, SCLEX_BLITZBASIC, SCLEX_PUREBASIC, SCLEX_FREEBASIC
 lex VB=SCLEX_VB SCE_B_
 lex VBScript=SCLEX_VBSCRIPT SCE_B_
@@ -2301,3 +2305,4 @@ val SCE_GD_COMMENTBLOCK=12
 val SCE_GD_STRINGEOL=13
 val SCE_GD_WORD2=14
 val SCE_GD_ANNOTATION=15
+val SCE_GD_NODEPATH=16
diff --git a/lexilla/include/SciLexer.h b/lexilla/include/SciLexer.h
index f78a248fe..9ce594f0f 100644
--- a/lexilla/include/SciLexer.h
+++ b/lexilla/include/SciLexer.h
@@ -558,7 +558,11 @@
 #define SCE_RB_STDIN 30
 #define SCE_RB_STDOUT 31
 #define SCE_RB_STDERR 40
-#define SCE_RB_UPPER_BOUND 41
+#define SCE_RB_STRING_W 41
+#define SCE_RB_STRING_I 42
+#define SCE_RB_STRING_QI 43
+#define SCE_RB_STRING_QS 44
+#define SCE_RB_UPPER_BOUND 45
 #define SCE_B_DEFAULT 0
 #define SCE_B_COMMENT 1
 #define SCE_B_NUMBER 2
@@ -2175,6 +2179,7 @@
 #define SCE_GD_STRINGEOL 13
 #define SCE_GD_WORD2 14
 #define SCE_GD_ANNOTATION 15
+#define SCE_GD_NODEPATH 16
 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */
 
 #endif
diff --git a/lexilla/lexers/LexCPP.cxx b/lexilla/lexers/LexCPP.cxx
index 1bf5b9551..b6eba27f1 100644
--- a/lexilla/lexers/LexCPP.cxx
+++ b/lexilla/lexers/LexCPP.cxx
@@ -91,6 +91,10 @@ 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 {
 	for (const char ch : s) {
 		if (!IsSpaceOrTab(ch))
@@ -138,23 +142,18 @@ BracketPair FindBracketPair(Tokens &tokens) {
 
 void highlightTaskMarker(StyleContext &sc, LexAccessor &styler,
 		int activity, const WordList &markerList, bool caseSensitive){
-	if ((isoperator(sc.chPrev) || IsASpace(sc.chPrev)) && markerList.Length()) {
-		constexpr Sci_PositionU lengthMarker = 50;
-		char marker[lengthMarker+1] = "";
-		const Sci_PositionU currPos = sc.currentPos;
-		Sci_PositionU i = 0;
-		while (i < lengthMarker) {
-			const char ch = styler.SafeGetCharAt(currPos + i);
-			if (IsASpace(ch) || isoperator(ch)) {
+	if (IsOperatorOrSpace(sc.chPrev) && !IsOperatorOrSpace(sc.ch) && markerList.Length()) {
+		std::string marker;
+		for (Sci_PositionU currPos = sc.currentPos; true; currPos++) {
+			const char ch = styler.SafeGetCharAt(currPos);
+			if (IsOperatorOrSpace(ch)) {
 				break;
 			}
 			if (caseSensitive)
-				marker[i] = ch;
+				marker.push_back(ch);
 			else
-				marker[i] = MakeLowerCase(ch);
-			i++;
+				marker.push_back(MakeLowerCase(ch));
 		}
-		marker[i] = '\0';
 		if (markerList.InList(marker)) {
 			sc.SetState(SCE_C_TASKMARKER|activity);
 		}
@@ -732,10 +731,7 @@ Sci_Position SCI_METHOD LexerCPP::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;
 			if (n == 4) {
 				// Rebuild preprocessorDefinitions
@@ -771,6 +767,9 @@ Sci_Position SCI_METHOD LexerCPP::WordListSet(int n, const char *wl) {
 void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
 	LexAccessor styler(pAccess);
 
+	const StyleContext::Transform transform = caseSensitive ?
+		StyleContext::Transform::none : StyleContext::Transform::lower;
+
 	const CharacterSet setOKBeforeRE(CharacterSet::setNone, "([{=,:;!%^&*|?~+-");
 	const CharacterSet setCouldBePostOp(CharacterSet::setNone, "+-");
 
@@ -847,6 +846,8 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 	std::string rawStringTerminator = rawStringTerminators.ValueAt(lineCurrent-1);
 	SparseState<std::string> rawSTNew(lineCurrent);
 
+	std::string currentText;
+
 	int activitySet = preproc.ActiveState();
 
 	const WordClassifier &classifierIdentifiers = subStyles.Classifier(SCE_C_IDENTIFIER);
@@ -932,31 +933,29 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 				break;
 			case SCE_C_IDENTIFIER:
 				if (sc.atLineStart || sc.atLineEnd || !setWord.Contains(sc.ch) || (sc.ch == '.')) {
-					char s[1000];
-					if (caseSensitive) {
-						sc.GetCurrent(s, sizeof(s));
-					} else {
-						sc.GetCurrentLowered(s, sizeof(s));
-					}
-					if (keywords.InList(s)) {
-						lastWordWasUUID = strcmp(s, "uuid") == 0;
+					sc.GetCurrentString(currentText, transform);
+					if (keywords.InList(currentText)) {
+						lastWordWasUUID = currentText == "uuid";
 						sc.ChangeState(SCE_C_WORD|activitySet);
-					} else if (keywords2.InList(s)) {
+					} else if (keywords2.InList(currentText)) {
 						sc.ChangeState(SCE_C_WORD2|activitySet);
-					} else if (keywords4.InList(s)) {
+					} else if (keywords4.InList(currentText)) {
 						sc.ChangeState(SCE_C_GLOBALCLASS|activitySet);
 					} else {
-						const int subStyle = classifierIdentifiers.ValueFor(s);
+						const int subStyle = classifierIdentifiers.ValueFor(currentText);
 						if (subStyle >= 0) {
 							sc.ChangeState(subStyle|activitySet);
 						}
 					}
 					const bool literalString = sc.ch == '\"';
 					if (literalString || sc.ch == '\'') {
-						size_t lenS = strlen(s);
+						std::string_view s = currentText;
+						size_t lenS = s.length();
 						const bool raw = literalString && sc.chPrev == 'R' && !setInvalidRawFirst.Contains(sc.chNext);
-						if (raw)
-							s[lenS--] = '\0';
+						if (raw) {
+							s.remove_suffix(1);
+							lenS--;
+						}
 						const bool valid =
 							(lenS == 0) ||
 							((lenS == 1) && ((s[0] == 'L') || (s[0] == 'u') || (s[0] == 'U'))) ||
@@ -1070,33 +1069,27 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 					seenDocKeyBrace = true;
 				} else if (!setDoxygen.Contains(sc.ch)
 				           && !(seenDocKeyBrace && (sc.ch == ',' || sc.ch == '.'))) {
-					char s[100];
-					if (caseSensitive) {
-						sc.GetCurrent(s, sizeof(s));
-					} else {
-						sc.GetCurrentLowered(s, sizeof(s));
-					}
 					if (!(IsASpace(sc.ch) || (sc.ch == 0))) {
 						sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR|activitySet);
-					} else if (!keywords3.InList(s + 1) && !keywords3.InList(s)) {
-						const int subStyleCDKW = classifierDocKeyWords.ValueFor(s+1);
-						if (subStyleCDKW >= 0) {
-							sc.ChangeState(subStyleCDKW|activitySet);
-						} else {
-							sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR|activitySet);
+					} else {
+						sc.GetCurrentString(currentText, transform);
+						assert(!currentText.empty());
+						std::string currentSuffix = currentText.substr(1);
+						if (!keywords3.InList(currentSuffix) && !keywords3.InList(currentText)) {
+							const int subStyleCDKW = classifierDocKeyWords.ValueFor(currentSuffix.c_str());
+							if (subStyleCDKW >= 0) {
+								sc.ChangeState(subStyleCDKW | activitySet);
+							} else {
+								sc.ChangeState(SCE_C_COMMENTDOCKEYWORDERROR | activitySet);
+							}
 						}
 					}
 					sc.SetState(styleBeforeDCKeyword|activitySet);
 					seenDocKeyBrace = false;
 				} else if (sc.ch == '>') {
-					char s[100];
-					if (caseSensitive) {
-						sc.GetCurrent(s, sizeof(s));
-					} else {
-						sc.GetCurrentLowered(s, sizeof(s));
-					}
-					if (!keywords3.InList(s)) {
-						const int subStyleCDKW = classifierDocKeyWords.ValueFor(s + 1);
+					sc.GetCurrentString(currentText, transform);
+					if (!keywords3.InList(currentText)) {
+						const int subStyleCDKW = classifierDocKeyWords.ValueFor(currentText.substr(1));
 						if (subStyleCDKW >= 0) {
 							sc.ChangeState(subStyleCDKW | activitySet);
 						} else {
@@ -1226,7 +1219,7 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 				}
 				break;
 			case SCE_C_TASKMARKER:
-				if (isoperator(sc.ch) || IsASpace(sc.ch)) {
+				if (IsOperatorOrSpace(sc.ch)) {
 					sc.SetState(styleBeforeTaskMarker|activitySet);
 					styleBeforeTaskMarker = SCE_C_DEFAULT;
 				}
diff --git a/lexilla/lexers/LexDiff.cxx b/lexilla/lexers/LexDiff.cxx
index 9fdd7e4f4..7f3394298 100644
--- a/lexilla/lexers/LexDiff.cxx
+++ b/lexilla/lexers/LexDiff.cxx
@@ -5,12 +5,12 @@
 // 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 <cctype>
+#include <cstdio>
+#include <cstdarg>
 
 #include <string>
 #include <string_view>
@@ -28,16 +28,14 @@
 
 using namespace Lexilla;
 
-static inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
+namespace {
+
+inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
 	return (styler[i] == '\n') ||
 	       ((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
 }
 
-#define DIFF_BUFFER_START_SIZE 16
-// Note that ColouriseDiffLine analyzes only the first DIFF_BUFFER_START_SIZE
-// characters of each line to classify the line.
-
-static void ColouriseDiffLine(char *lineBuffer, Sci_Position endLine, Accessor &styler) {
+void ColouriseDiffLine(const char *lineBuffer, Sci_Position endLine, Accessor &styler) {
 	// It is needed to remember the current state to recognize starting
 	// comment lines before the first "diff " or "--- ". If a real
 	// difference starts then each line starting with ' ' is a whitespace
@@ -102,39 +100,30 @@ static void ColouriseDiffLine(char *lineBuffer, Sci_Position endLine, Accessor &
 	}
 }
 
-static void ColouriseDiffDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
-	char lineBuffer[DIFF_BUFFER_START_SIZE] = "";
+void ColouriseDiffDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+	std::string lineBuffer;
 	styler.StartAt(startPos);
 	styler.StartSegment(startPos);
-	Sci_PositionU linePos = 0;
 	for (Sci_PositionU i = startPos; i < startPos + length; i++) {
 		if (AtEOL(styler, i)) {
-			if (linePos < DIFF_BUFFER_START_SIZE) {
-				lineBuffer[linePos] = 0;
-			}
-			ColouriseDiffLine(lineBuffer, i, styler);
-			linePos = 0;
-		} else if (linePos < DIFF_BUFFER_START_SIZE - 1) {
-			lineBuffer[linePos++] = styler[i];
-		} else if (linePos == DIFF_BUFFER_START_SIZE - 1) {
-			lineBuffer[linePos++] = 0;
+			ColouriseDiffLine(lineBuffer.c_str(), i, styler);
+			lineBuffer.clear();
+		} else {
+			lineBuffer.push_back(styler[i]);
 		}
 	}
-	if (linePos > 0) {	// Last line does not have ending characters
-		if (linePos < DIFF_BUFFER_START_SIZE) {
-			lineBuffer[linePos] = 0;
-		}
-		ColouriseDiffLine(lineBuffer, startPos + length - 1, styler);
+	if (!lineBuffer.empty()) {	// Last line does not have ending characters
+		ColouriseDiffLine(lineBuffer.c_str(), startPos + length - 1, styler);
 	}
 }
 
-static void FoldDiffDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
+void FoldDiffDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
 	Sci_Position curLine = styler.GetLine(startPos);
 	Sci_Position curLineStart = styler.LineStart(curLine);
 	int prevLevel = curLine > 0 ? styler.LevelAt(curLine - 1) : SC_FOLDLEVELBASE;
-	int nextLevel;
 
 	do {
+		int nextLevel = 0;
 		const int lineType = styler.StyleAt(curLineStart);
 		if (lineType == SCE_DIFF_COMMAND)
 			nextLevel = SC_FOLDLEVELBASE | SC_FOLDLEVELHEADERFLAG;
@@ -157,8 +146,10 @@ static void FoldDiffDoc(Sci_PositionU startPos, Sci_Position length, int, WordLi
 	} while (static_cast<Sci_Position>(startPos)+length > curLineStart);
 }
 
-static const char *const emptyWordListDesc[] = {
-	0
+const char *const emptyWordListDesc[] = {
+	nullptr
 };
 
+}
+
 LexerModule lmDiff(SCLEX_DIFF, ColouriseDiffDoc, "diff", FoldDiffDoc, emptyWordListDesc);
diff --git a/lexilla/lexers/LexFSharp.cxx b/lexilla/lexers/LexFSharp.cxx
index a86a447e3..d469fc7f6 100644
--- a/lexilla/lexers/LexFSharp.cxx
+++ b/lexilla/lexers/LexFSharp.cxx
@@ -48,22 +48,13 @@ static constexpr int keywordClasses[] = {
 namespace {
 
 struct OptionsFSharp {
-	bool fold;
-	bool foldCompact;
-	bool foldComment;
-	bool foldCommentStream;
-	bool foldCommentMultiLine;
-	bool foldPreprocessor;
-	bool foldImports;
-	OptionsFSharp() {
-		fold = true;
-		foldCompact = true;
-		foldComment = true;
-		foldCommentStream = true;
-		foldCommentMultiLine = true;
-		foldPreprocessor = false;
-		foldImports = true;
-	}
+	bool fold = true;
+	bool foldCompact = true;
+	bool foldComment = true;
+	bool foldCommentStream = true;
+	bool foldCommentMultiLine = true;
+	bool foldPreprocessor = false;
+	bool foldImports = true;
 };
 
 struct OptionSetFSharp : public OptionSet<OptionsFSharp> {
@@ -91,25 +82,11 @@ struct OptionSetFSharp : public OptionSet<OptionsFSharp> {
 	}
 };
 
-const CharacterSet setOperators = CharacterSet(CharacterSet::setNone, "~^'-+*/%=@|&<>()[]{};,:!?");
-const CharacterSet setClosingTokens = CharacterSet(CharacterSet::setNone, ")}]");
-const CharacterSet setFormatSpecs = CharacterSet(CharacterSet::setNone, ".%aAbBcdeEfFgGiMoOstuxX0123456789");
-const CharacterSet setDotNetFormatSpecs = CharacterSet(CharacterSet::setNone, "cCdDeEfFgGnNpPxX");
-const CharacterSet setFormatFlags = CharacterSet(CharacterSet::setNone, ".-+0 ");
-const CharacterSet numericMetaChars1 = CharacterSet(CharacterSet::setNone, "_uU");
-const CharacterSet numericMetaChars2 = CharacterSet(CharacterSet::setNone, "fFIlLmMnsy");
-std::map<int, int> numericPrefixes = { { 'b', 2 }, { 'o', 8 }, { 'x', 16 } };
-constexpr Sci_Position ZERO_LENGTH = -1;
-
 struct FSharpString {
-	Sci_Position startPos;
-	int startChar;
-	FSharpString() {
-		startPos = ZERO_LENGTH;
-		startChar = '"';
-	}
+	Sci_Position startPos = INVALID_POSITION;
+	int startChar = '"';
 	constexpr bool HasLength() const {
-		return startPos > ZERO_LENGTH;
+		return startPos > INVALID_POSITION;
 	}
 	constexpr bool CanInterpolate() const {
 		return startChar == '$';
@@ -278,20 +255,6 @@ inline bool CanEmbedQuotes(StyleContext &cxt) {
 	       cxt.Match('`', '`');
 }
 
-inline bool IsNumber(StyleContext &cxt, const int base = 10) {
-	return IsADigit(cxt.ch, base) || (IsADigit(cxt.chPrev, base) && numericMetaChars1.Contains(cxt.ch)) ||
-		(IsADigit(cxt.GetRelative(-2), base) && numericMetaChars2.Contains(cxt.ch));
-}
-
-inline bool IsFloat(StyleContext &cxt) {
-	if (cxt.MatchIgnoreCase("e+") || cxt.MatchIgnoreCase("e-")) {
-		cxt.Forward();
-		return true;
-	}
-	return ((cxt.chPrev == '.' && IsADigit(cxt.ch)) ||
-		(IsADigit(cxt.chPrev) && (cxt.ch == '.' || numericMetaChars2.Contains(cxt.ch))));
-}
-
 inline bool IsLineEnd(StyleContext &cxt, const Sci_Position offset) {
 	const int ch = cxt.GetRelative(offset, '\n');
 	return (ch == '\r' || ch == '\n');
@@ -301,10 +264,28 @@ class LexerFSharp : public DefaultLexer {
 	WordList keywords[WORDLIST_SIZE];
 	OptionsFSharp options;
 	OptionSetFSharp optionSet;
+	CharacterSet setOperators;
+	CharacterSet setFormatSpecs;
+	CharacterSet setDotNetFormatSpecs;
+	CharacterSet setFormatFlags;
+	CharacterSet numericMetaChars1;
+	CharacterSet numericMetaChars2;
+	std::map<int, int> numericPrefixes = { { 'b', 2 }, { 'o', 8 }, { 'x', 16 } };
 
 public:
-	explicit LexerFSharp() : DefaultLexer(lexerName, SCLEX_FSHARP) {
+	explicit LexerFSharp()
+	    : DefaultLexer(lexerName, SCLEX_FSHARP),
+	      setOperators(CharacterSet::setNone, "~^'-+*/%=@|&<>()[]{};,:!?"),
+	      setFormatSpecs(CharacterSet::setNone, ".%aAbBcdeEfFgGiMoOstuxX0123456789"),
+	      setDotNetFormatSpecs(CharacterSet::setNone, "cCdDeEfFgGnNpPxX"),
+	      setFormatFlags(CharacterSet::setNone, ".-+0 "),
+	      numericMetaChars1(CharacterSet::setNone, "_uU"),
+	      numericMetaChars2(CharacterSet::setNone, "fFIlLmMnsy") {
 	}
+	LexerFSharp(const LexerFSharp &) = delete;
+	LexerFSharp(LexerFSharp &&) = delete;
+	LexerFSharp &operator=(const LexerFSharp &) = delete;
+	LexerFSharp &operator=(LexerFSharp &&) = delete;
 	static ILexer5 *LexerFactoryFSharp() {
 		return new LexerFSharp();
 	}
@@ -347,16 +328,31 @@ public:
 		if (optionSet.PropertySet(&options, key, val)) {
 			return 0;
 		}
-		return ZERO_LENGTH;
+		return INVALID_POSITION;
 	}
 	Sci_Position SCI_METHOD WordListSet(int n, const char *wl) override;
 	void SCI_METHOD Lex(Sci_PositionU start, Sci_Position length, int initStyle, IDocument *pAccess) override;
 	void SCI_METHOD Fold(Sci_PositionU start, Sci_Position length, int initStyle,IDocument *pAccess) override;
+
+private:
+	inline bool IsNumber(StyleContext &cxt, const int base = 10) {
+		return IsADigit(cxt.ch, base) || (IsADigit(cxt.chPrev, base) && numericMetaChars1.Contains(cxt.ch)) ||
+		       (IsADigit(cxt.GetRelative(-2), base) && numericMetaChars2.Contains(cxt.ch));
+	}
+
+	inline bool IsFloat(StyleContext &cxt) {
+		if (cxt.MatchIgnoreCase("e+") || cxt.MatchIgnoreCase("e-")) {
+			cxt.Forward();
+			return true;
+		}
+		return ((cxt.chPrev == '.' && IsADigit(cxt.ch)) ||
+			(IsADigit(cxt.chPrev) && (cxt.ch == '.' || numericMetaChars2.Contains(cxt.ch))));
+	}
 };
 
 Sci_Position SCI_METHOD LexerFSharp::WordListSet(int n, const char *wl) {
 	WordList *wordListN = nullptr;
-	Sci_Position firstModification = ZERO_LENGTH;
+	Sci_Position firstModification = INVALID_POSITION;
 
 	if (n < WORDLIST_SIZE) {
 		wordListN = &keywords[n];
@@ -370,7 +366,7 @@ Sci_Position SCI_METHOD LexerFSharp::WordListSet(int n, const char *wl) {
 void SCI_METHOD LexerFSharp::Lex(Sci_PositionU start, Sci_Position length, int initStyle, IDocument *pAccess) {
 	LexAccessor styler(pAccess);
 	StyleContext sc(start, static_cast<Sci_PositionU>(length), initStyle, styler);
-	Sci_Position lineCurrent = styler.GetLine(start);
+	Sci_Position lineCurrent = styler.GetLine(static_cast<Sci_Position>(start));
 	Sci_PositionU cursor = 0;
 	UnicodeChar uniCh = UnicodeChar();
 	FSharpString fsStr = FSharpString();
@@ -411,7 +407,7 @@ void SCI_METHOD LexerFSharp::Lex(Sci_PositionU start, Sci_Position length, int i
 					state = SCE_FSHARP_CHARACTER;
 				} else if (MatchStringStart(sc)) {
 					fsStr.startChar = sc.ch;
-					fsStr.startPos = ZERO_LENGTH;
+					fsStr.startPos = INVALID_POSITION;
 					if (CanEmbedQuotes(sc)) {
 						// double quotes after this position should be non-terminating
 						fsStr.startPos = static_cast<Sci_Position>(sc.currentPos - cursor);
diff --git a/lexilla/lexers/LexGDScript.cxx b/lexilla/lexers/LexGDScript.cxx
index e20ddb02a..4f889c1bc 100644
--- a/lexilla/lexers/LexGDScript.cxx
+++ b/lexilla/lexers/LexGDScript.cxx
@@ -94,6 +94,16 @@ int GetGDStringState(Accessor &styler, Sci_Position i, Sci_PositionU *nextIndex)
 	}
 }
 
+int GetGDStringState(int ch) {
+	if (ch != '"' && ch != '\'')
+		return SCE_GD_DEFAULT;
+
+	if (ch == '"')
+		return SCE_GD_STRING;
+	else
+		return SCE_GD_CHARACTER;
+}
+
 inline bool IsAWordChar(int ch, bool unicodeIdentifiers) {
 	if (IsASCII(ch))
 		return (IsAlphaNumeric(ch) || ch == '.' || ch == '_');
@@ -104,6 +114,16 @@ inline bool IsAWordChar(int ch, bool unicodeIdentifiers) {
 	return IsXidContinue(ch);
 }
 
+inline bool IsANodePathChar(int ch, bool unicodeIdentifiers) {
+	if (IsASCII(ch))
+		return (IsAlphaNumeric(ch) || ch == '_' || ch == '/' || ch =='%');
+
+	if (!unicodeIdentifiers)
+		return false;
+
+	return IsXidContinue(ch);
+}
+
 inline bool IsAWordStart(int ch, bool unicodeIdentifiers) {
 	if (IsASCII(ch))
 		return (IsUpperOrLowerCase(ch) || ch == '_');
@@ -209,6 +229,7 @@ LexicalClass lexicalClasses[] = {
 	13, "SCE_GD_STRINGEOL", "error literal string", "End of line where string is not closed",
 	14, "SCE_GD_WORD2", "identifier", "Highlighted identifiers",
 	15, "SCE_GD_ANNOTATION", "annotation", "Annotations",
+	16, "SCE_GD_NODEPATH", "path", "Node path",
 };
 
 }
@@ -390,7 +411,9 @@ void SCI_METHOD LexerGDScript::Lex(Sci_PositionU startPos, Sci_Position length,
 	bool indentGood = true;
 	Sci_Position startIndicator = sc.currentPos;
 	bool inContinuedString = false;
-
+	bool percentIsNodePath = false;
+	int nodePathStringState = SCE_GD_DEFAULT;
+	
 	for (; sc.More(); sc.Forward()) {
 
 		if (sc.atLineStart) {
@@ -412,6 +435,7 @@ void SCI_METHOD LexerGDScript::Lex(Sci_PositionU startPos, Sci_Position length,
 		}
 
 		if (sc.atLineEnd) {
+			percentIsNodePath = false;
 			ProcessLineEnd(sc, inContinuedString);
 			lineCurrent++;
 			if (!sc.More())
@@ -479,6 +503,18 @@ void SCI_METHOD LexerGDScript::Lex(Sci_PositionU startPos, Sci_Position length,
 			if (!IsAWordStart(sc.ch, options.unicodeIdentifiers)) {
 				sc.SetState(SCE_GD_DEFAULT);
 			}
+		} else if (sc.state == SCE_GD_NODEPATH) {
+			if (nodePathStringState != SCE_GD_DEFAULT) {
+				if (sc.ch == GetGDStringQuoteChar(nodePathStringState) ) {
+					nodePathStringState = SCE_GD_DEFAULT;
+				}
+			} else {
+				if (IsGDStringStart(sc.ch)) {
+					nodePathStringState = GetGDStringState(sc.ch);
+				} else if (!IsANodePathChar(sc.ch, options.unicodeIdentifiers)) {
+					sc.SetState(SCE_GD_DEFAULT);
+				}
+			}
 		} else if (IsGDSingleQuoteStringState(sc.state)) {
 			if (sc.ch == '\\') {
 				if ((sc.chNext == '\r') && (sc.GetRelative(2) == '\n')) {
@@ -548,7 +584,11 @@ void SCI_METHOD LexerGDScript::Lex(Sci_PositionU startPos, Sci_Position length,
 					base_n_number = false;
 					sc.SetState(SCE_GD_NUMBER);
 				}
+			} else if ((sc.ch == '$') || (sc.ch == '%' && (percentIsNodePath || IsFirstNonWhitespace(sc.currentPos, styler)))) {
+				percentIsNodePath = false;
+				sc.SetState(SCE_GD_NODEPATH);
 			} else if (isoperator(sc.ch) || sc.ch == '`') {
+				percentIsNodePath = !((sc.ch == ')') || (sc.ch == ']') || (sc.ch == '}'));
 				sc.SetState(SCE_GD_OPERATOR);
 			} else if (sc.ch == '#') {
 				sc.SetState(sc.chNext == '#' ? SCE_GD_COMMENTBLOCK : SCE_GD_COMMENTLINE);
diff --git a/lexilla/lexers/LexHTML.cxx b/lexilla/lexers/LexHTML.cxx
index 854071837..48e4b919f 100644
--- a/lexilla/lexers/LexHTML.cxx
+++ b/lexilla/lexers/LexHTML.cxx
@@ -1060,10 +1060,7 @@ Sci_Position SCI_METHOD LexerHTML::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/lexilla/lexers/LexMake.cxx b/lexilla/lexers/LexMake.cxx
index 3e8451255..5033c62bd 100644
--- a/lexilla/lexers/LexMake.cxx
+++ b/lexilla/lexers/LexMake.cxx
@@ -5,12 +5,12 @@
 // 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 <cctype>
+#include <cstdio>
+#include <cstdarg>
 
 #include <string>
 #include <string_view>
@@ -34,12 +34,12 @@ static inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
 }
 
 static void ColouriseMakeLine(
-    char *lineBuffer,
-    Sci_PositionU lengthLine,
+	const std::string &lineBuffer,
     Sci_PositionU startLine,
     Sci_PositionU endPos,
     Accessor &styler) {
 
+	const Sci_PositionU lengthLine = lineBuffer.length();
 	Sci_PositionU i = 0;
 	Sci_Position lastNonSpace = -1;
 	unsigned int state = SCE_MAKE_DEFAULT;
@@ -118,28 +118,26 @@ static void ColouriseMakeLine(
 }
 
 static void ColouriseMakeDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *[], Accessor &styler) {
-	char lineBuffer[1024];
+	std::string lineBuffer;
 	styler.StartAt(startPos);
 	styler.StartSegment(startPos);
-	Sci_PositionU linePos = 0;
 	Sci_PositionU startLine = startPos;
 	for (Sci_PositionU i = startPos; i < startPos + length; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+		lineBuffer.push_back(styler[i]);
+		if (AtEOL(styler, i)) {
 			// End of line (or of line buffer) met, colourise it
-			lineBuffer[linePos] = '\0';
-			ColouriseMakeLine(lineBuffer, linePos, startLine, i, styler);
-			linePos = 0;
+			ColouriseMakeLine(lineBuffer, startLine, i, styler);
+			lineBuffer.clear();
 			startLine = i + 1;
 		}
 	}
-	if (linePos > 0) {	// Last line does not have ending characters
-		ColouriseMakeLine(lineBuffer, linePos, startLine, startPos + length - 1, styler);
+	if (!lineBuffer.empty()) {	// Last line does not have ending characters
+		ColouriseMakeLine(lineBuffer, startLine, startPos + length - 1, styler);
 	}
 }
 
 static const char *const emptyWordListDesc[] = {
-	0
+	nullptr
 };
 
-LexerModule lmMake(SCLEX_MAKEFILE, ColouriseMakeDoc, "makefile", 0, emptyWordListDesc);
+LexerModule lmMake(SCLEX_MAKEFILE, ColouriseMakeDoc, "makefile", nullptr, emptyWordListDesc);
diff --git a/lexilla/lexers/LexPython.cxx b/lexilla/lexers/LexPython.cxx
index a25724204..a0d38c63c 100644
--- a/lexilla/lexers/LexPython.cxx
+++ b/lexilla/lexers/LexPython.cxx
@@ -500,10 +500,7 @@ Sci_Position SCI_METHOD LexerPython::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/lexilla/lexers/LexRaku.cxx b/lexilla/lexers/LexRaku.cxx
index 2f5b0c7cf..8284ebcaa 100644
--- a/lexilla/lexers/LexRaku.cxx
+++ b/lexilla/lexers/LexRaku.cxx
@@ -339,7 +339,7 @@ bool IsValidRegOrQAdjacent(int ch) noexcept {
 
 /*
  * IsValidRegOrQPrecede
- * - returns true if ch is a valid preceeding character to put directly before Q / q
+ * - returns true if ch is a valid preceding character to put directly before Q / q
  *   * ref: Q Language: https://docs.raku.org/language/quoting
  */
 bool IsValidRegOrQPrecede(int ch) noexcept {
@@ -469,7 +469,7 @@ bool IsRegexStartAtScPos(StyleContext &sc, int &type, CharacterSet &set) {
 
 /*
  * IsValidIdentPrecede
- * - returns if ch is a valid preceeding char to put directly before an identifier
+ * - returns if ch is a valid preceding char to put directly before an identifier
  */
 bool IsValidIdentPrecede(int ch) noexcept {
 	return !(IsAlphaNumeric(ch) || ch == '_' || ch == '@' || ch == '$' || ch == '%');
@@ -486,7 +486,7 @@ bool IsValidDelimiter(int ch) noexcept {
 
 /*
  * GetDelimiterCloseChar
- * - returns the corrisponding close char for a given delimiter (could be the same char)
+ * - returns the corresponding close char for a given delimiter (could be the same char)
  */
 int GetDelimiterCloseChar(int ch) noexcept {
 	int ch_end = GetBracketCloseChar(ch);
@@ -498,7 +498,7 @@ int GetDelimiterCloseChar(int ch) noexcept {
 
 /*
  * GetRepeatCharCount
- * - returns the occurence count of match
+ * - returns the occurrence count of match
  */
 Sci_Position GetRepeatCharCount(StyleContext &sc, int chMatch, Sci_Position length) {
 	Sci_Position cnt = 0;
@@ -612,8 +612,8 @@ Sci_Position LengthToNextChar(StyleContext &sc, const Sci_Position length) {
 
 /*
  * GetRelativeString
- * - gets a relitive string and sets it in &str
- *   - resets string before seting
+ * - gets a relative string and sets it in &str
+ *   - resets string before setting
  */
 void GetRelativeString(StyleContext &sc, Sci_Position offset, Sci_Position length,
 		std::string &str) {
@@ -754,7 +754,7 @@ bool LexerRaku::IsOperatorChar(const int ch) {
  *   FIXME: *still* may not contain all valid characters
  */
 bool LexerRaku::IsWordChar(const int ch, bool allowNumber) {
-	// Unicode numbers should not apear in word identifiers
+	// Unicode numbers should not appear in word identifiers
 	if (ch > 0x7F) {
 		const CharacterCategory cc = CategoriseCharacter(ch);
 		switch (cc) {
@@ -1033,20 +1033,20 @@ Sci_Position LexerRaku::LengthToNonWordChar(StyleContext &sc, Sci_Position lengt
  */
 void SCI_METHOD LexerRaku::Lex(Sci_PositionU startPos, Sci_Position length, int initStyle, IDocument *pAccess) {
 	LexAccessor styler(pAccess);
-	DelimPair dpEmbeded;			// delimiter pair: embeded comments
+	DelimPair dpEmbeded;			// delimiter pair: embedded comments
 	DelimPair dpString;				// delimiter pair: string
 	DelimPair dpRegQ;				// delimiter pair: Regex / Q Lang
 	std::string hereDelim;			// heredoc delimiter (if in heredoc)
 	int hereState = 0;				// heredoc state to use (Q / QQ)
 	int numState = 0;				// number state / type
-	short cntDecimal = 0;			// number decinal count
+	short cntDecimal = 0;			// number decimal count
 	std::string wordLast;			// last word seen
 	std::string identLast;			// last identifier seen
 	std::string adverbLast;			// last (single) adverb seen
 	WordList lastAdverbs;			// last adverbs seen
 	Sci_Position len;				// temp length value
 	char s[100];					// temp char string
-	int typeDetect;					// temp type detected (for regex and Q lang)
+	int typeDetect = -1;			// temp type detected (for regex and Q lang)
 	Sci_Position lengthToEnd;		// length until the end of range
 
 	// Backtrack to safe start position before complex quoted elements
@@ -1216,7 +1216,7 @@ void SCI_METHOD LexerRaku::Lex(Sci_PositionU startPos, Sci_Position length, int
 						sc.Forward();
 					} else {
 						sc.SetState(SCE_RAKU_DEFAULT);
-						break; // too many decinal places
+						break; // too many decimal places
 					}
 				}
 				switch (numState) {
@@ -1463,7 +1463,7 @@ void SCI_METHOD LexerRaku::Lex(Sci_PositionU startPos, Sci_Position length, int
 				sc.SetState(hereState);
 			}
 
-			// Reset words: on operator simi-colon OR '}' (end of statement)
+			// Reset words: on operator semi-colon OR '}' (end of statement)
 			if (sc.state == SCE_RAKU_OPERATOR && (sc.ch == ';' || sc.ch == '}')) {
 				wordLast.clear();
 				identLast.clear();
@@ -1480,11 +1480,11 @@ void SCI_METHOD LexerRaku::Lex(Sci_PositionU startPos, Sci_Position length, int
 				sc.Forward(); // Condition met for "embedded comment"
 				dpEmbeded.opener = sc.ch;
 
-				// Find the opposite (termination) closeing bracket (if any)
+				// Find the opposite (termination) closing bracket (if any)
 				dpEmbeded.closer[0] = GetBracketCloseChar(dpEmbeded.opener);
 				if (dpEmbeded.closer[0] > 0) { // Enter "embedded comment"
 
-					// Find multiple opening character occurence
+					// Find multiple opening character occurrence
 					dpEmbeded.count = GetRepeatCharCount(sc, dpEmbeded.opener, lengthToEnd);
 					sc.SetState(SCE_RAKU_COMMENTEMBED);
 					sc.Forward(dpEmbeded.count - 1); // incremented in the next loop
diff --git a/lexilla/lexers/LexRuby.cxx b/lexilla/lexers/LexRuby.cxx
index af5857561..77c97f80e 100644
--- a/lexilla/lexers/LexRuby.cxx
+++ b/lexilla/lexers/LexRuby.cxx
@@ -5,12 +5,12 @@
 // Copyright 2001- by Clemens Wyss <wys@helbling.ch>
 // 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 <cstdio>
+#include <cstdarg>
 
 #include <string>
 #include <string_view>
@@ -28,43 +28,50 @@
 
 using namespace Lexilla;
 
+namespace {
+
 //XXX Identical to Perl, put in common area
-static inline bool isEOLChar(char ch) {
+constexpr bool isEOLChar(char ch) noexcept {
     return (ch == '\r') || (ch == '\n');
 }
 
-#define isSafeASCII(ch) ((unsigned int)(ch) <= 127)
-// This one's redundant, but makes for more readable code
-#define isHighBitChar(ch) ((unsigned int)(ch) > 127)
+constexpr bool isSafeASCII(char ch) noexcept {
+    return static_cast<unsigned char>(ch) <= 127;
+}
 
-static inline bool isSafeAlpha(char ch) {
+// This one's redundant, but makes for more readable code
+constexpr bool isHighBitChar(char ch) noexcept {
+    return static_cast<unsigned char>(ch) > 127;
+}
+
+inline bool isSafeAlpha(char ch) noexcept {
     return (isSafeASCII(ch) && isalpha(ch)) || ch == '_';
 }
 
-static inline bool isSafeAlnum(char ch) {
+inline bool isSafeAlnum(char ch) noexcept {
     return (isSafeASCII(ch) && isalnum(ch)) || ch == '_';
 }
 
-static inline bool isSafeAlnumOrHigh(char ch) {
+inline bool isSafeAlnumOrHigh(char ch) noexcept {
     return isHighBitChar(ch) || isalnum(ch) || ch == '_';
 }
 
-static inline bool isSafeDigit(char ch) {
+inline bool isSafeDigit(char ch) noexcept {
     return isSafeASCII(ch) && isdigit(ch);
 }
 
-static inline bool isSafeWordcharOrHigh(char ch) {
+inline bool isSafeWordcharOrHigh(char ch) noexcept {
     // Error: scintilla's KeyWords.h includes '.' as a word-char
     // we want to separate things that can take methods from the
     // methods.
     return isHighBitChar(ch) || isalnum(ch) || ch == '_';
 }
 
-static bool inline iswhitespace(char ch) {
-    return ch == ' ' || ch == '\t';
+constexpr bool isWhiteSpace(char ch) noexcept {
+    return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n';
 }
 
-static inline bool isQestionMarkChar(char chNext, char chNext2) {
+inline bool isQestionMarkChar(char chNext, char chNext2) noexcept {
     // followed by a single character or escape sequence that corresponds to a single codepoint
     if (isSafeAlnum(chNext)) {
         return !isSafeWordcharOrHigh(chNext2);
@@ -76,12 +83,12 @@ static inline bool isQestionMarkChar(char chNext, char chNext2) {
 #define MAX_KEYWORD_LENGTH 200
 
 #define STYLE_MASK 63
-#define actual_style(style) (style & STYLE_MASK)
+#define actual_style(style) ((style) & STYLE_MASK)
 
-static bool followsDot(Sci_PositionU pos, Accessor &styler) {
+bool followsDot(Sci_PositionU pos, Accessor &styler) {
     styler.Flush();
     for (; pos >= 1; --pos) {
-        int style = actual_style(styler.StyleAt(pos));
+        const int style = actual_style(styler.StyleAt(pos));
         char ch;
         switch (style) {
         case SCE_RB_DEFAULT:
@@ -104,21 +111,21 @@ static bool followsDot(Sci_PositionU pos, Accessor &styler) {
 }
 
 // Forward declarations
-static bool keywordIsAmbiguous(const char *prevWord);
-static bool keywordDoStartsLoop(Sci_Position pos,
-                                Accessor &styler);
-static bool keywordIsModifier(const char *word,
-                              Sci_Position pos,
-                              Accessor &styler);
+bool keywordIsAmbiguous(const char *prevWord) noexcept;
+bool keywordDoStartsLoop(Sci_Position pos, Accessor &styler);
+bool keywordIsModifier(const char *word, Sci_Position pos, Accessor &styler);
 
-static int ClassifyWordRb(Sci_PositionU start, Sci_PositionU end, char ch, WordList &keywords, Accessor &styler, char *prevWord) {
+// pseudo style: prefer regex after identifier
+#define SCE_RB_IDENTIFIER_PREFERRE  SCE_RB_UPPER_BOUND
+
+int ClassifyWordRb(Sci_PositionU start, Sci_PositionU end, char ch, WordList &keywords, Accessor &styler, char *prevWord) {
     char s[MAX_KEYWORD_LENGTH];
-    Sci_PositionU i, j;
+    Sci_PositionU j = 0;
     Sci_PositionU lim = end - start + 1; // num chars to copy
     if (lim >= MAX_KEYWORD_LENGTH) {
         lim = MAX_KEYWORD_LENGTH - 1;
     }
-    for (i = start, j = 0; j < lim; i++, j++) {
+    for (Sci_PositionU i = start; j < lim; i++, j++) {
         s[j] = styler[i];
     }
     s[j] = '\0';
@@ -137,8 +144,7 @@ static int ClassifyWordRb(Sci_PositionU start, Sci_PositionU end, char ch, WordL
                 style = SCE_RB_IDENTIFIER;
             }
         }
-    }
-    else if (keywords.InList(s) && ((start == 0) || !followsDot(start - 1, styler))) {
+    } else if (keywords.InList(s) && ((start == 0) || !followsDot(start - 1, styler))) {
         if (keywordIsAmbiguous(s)
                 && keywordIsModifier(s, start, styler)) {
 
@@ -163,12 +169,20 @@ static int ClassifyWordRb(Sci_PositionU start, Sci_PositionU end, char ch, WordL
         prevWord[0] = 0;
     }
     styler.ColourTo(end, style);
+
+    if (chAttr == SCE_RB_IDENTIFIER) {
+        // find heredoc in lib/ruby folder: rg "\w+\s+<<[\w\-~'\"`]"
+        // Kernel methods
+        if (!strcmp(s, "puts") || !strcmp(s, "print") || !strcmp(s, "warn") || !strcmp(s, "eval")) {
+            chAttr = SCE_RB_IDENTIFIER_PREFERRE;
+        }
+    }
     return chAttr;
 }
 
 
 //XXX Identical to Perl, put in common area
-static bool isMatch(Accessor &styler, Sci_Position lengthDoc, Sci_Position pos, const char *val) {
+bool isMatch(Accessor &styler, Sci_Position lengthDoc, Sci_Position pos, const char *val) {
     if ((pos + static_cast<int>(strlen(val))) >= lengthDoc) {
         return false;
     }
@@ -185,16 +199,12 @@ static bool isMatch(Accessor &styler, Sci_Position lengthDoc, Sci_Position pos,
 // and then check for leading white space
 
 // Precondition: the here-doc target can be indented
-static bool lookingAtHereDocDelim(Accessor   	&styler,
-                                  Sci_Position 	pos,
-                                  Sci_Position 	lengthDoc,
-                                  const char   *HereDocDelim)
-{
+bool lookingAtHereDocDelim(Accessor &styler, Sci_Position pos, Sci_Position lengthDoc, const char *HereDocDelim) {
     if (!isMatch(styler, lengthDoc, pos, HereDocDelim)) {
         return false;
     }
     while (--pos > 0) {
-        char ch = styler[pos];
+        const char ch = styler[pos];
         if (isEOLChar(ch)) {
             return true;
         } else if (ch != ' ' && ch != '\t') {
@@ -205,7 +215,7 @@ static bool lookingAtHereDocDelim(Accessor   	&styler,
 }
 
 //XXX Identical to Perl, put in common area
-static char opposite(char ch) {
+constexpr char opposite(char ch) noexcept {
     if (ch == '(')
         return ')';
     if (ch == '[')
@@ -220,29 +230,27 @@ static char opposite(char ch) {
 // Null transitions when we see we've reached the end
 // and need to relex the curr char.
 
-static void redo_char(Sci_Position &i, char &ch, char &chNext, char &chNext2,
-                      int &state) {
+void redo_char(Sci_Position &i, char &ch, char &chNext, char &chNext2, int &state) noexcept {
     i--;
     chNext2 = chNext;
     chNext = ch;
     state = SCE_RB_DEFAULT;
 }
 
-static void advance_char(Sci_Position &i, char &ch, char &chNext, char &chNext2) {
+void advance_char(Sci_Position &i, char &ch, char &chNext, char &chNext2) noexcept {
     i++;
     ch = chNext;
     chNext = chNext2;
 }
 
 // precondition: startPos points to one after the EOL char
-static bool currLineContainsHereDelims(Sci_Position &startPos,
-                                       Accessor &styler) {
+bool currLineContainsHereDelims(Sci_Position &startPos, Accessor &styler) {
     if (startPos <= 1)
         return false;
 
     Sci_Position pos;
     for (pos = startPos - 1; pos > 0; pos--) {
-        char ch = styler.SafeGetCharAt(pos);
+        const char ch = styler.SafeGetCharAt(pos);
         if (isEOLChar(ch)) {
             // Leave the pointers where they are -- there are no
             // here doc delims on the current line, even if
@@ -280,53 +288,83 @@ public:
         Up    = '\0';
         Down  = '\0';
     }
-    void Open(char u) {
+    void Open(char u) noexcept {
         Count++;
         Up    = u;
         Down  = opposite(Up);
     }
 };
 
-
-static void enterInnerExpression(int  *p_inner_string_types,
-                                 int  *p_inner_expn_brace_counts,
-                                 QuoteCls *p_inner_quotes,
-                                 int  &inner_string_count,
-                                 int  &state,
-                                 int  &brace_counts,
-                                 QuoteCls curr_quote
-                                ) {
-    p_inner_string_types[inner_string_count] = state;
-    state = SCE_RB_DEFAULT;
-    p_inner_expn_brace_counts[inner_string_count] = brace_counts;
-    brace_counts = 0;
-    p_inner_quotes[inner_string_count] = curr_quote;
-    ++inner_string_count;
+constexpr bool isPercentLiteral(int state) noexcept {
+    return state == SCE_RB_STRING_Q
+           || state == SCE_RB_STRING_QQ
+           // excluded SCE_RB_STRING_QR
+           || state == SCE_RB_STRING_W
+           || state == SCE_RB_STRING_QW
+           || state == SCE_RB_STRING_I
+           || state == SCE_RB_STRING_QI
+           || state == SCE_RB_STRING_QS
+           || state == SCE_RB_STRING_QX;
 }
 
-static void exitInnerExpression(int *p_inner_string_types,
-                                int *p_inner_expn_brace_counts,
-                                QuoteCls *p_inner_quotes,
-                                int &inner_string_count,
-                                int &state,
-                                int  &brace_counts,
-                                QuoteCls &curr_quote
-                               ) {
-    --inner_string_count;
-    state = p_inner_string_types[inner_string_count];
-    brace_counts = p_inner_expn_brace_counts[inner_string_count];
-    curr_quote = p_inner_quotes[inner_string_count];
+constexpr bool isInterpolableLiteral(int state) noexcept {
+    return state != SCE_RB_STRING_Q
+           && state != SCE_RB_STRING_W
+           && state != SCE_RB_STRING_I
+           && state != SCE_RB_STRING_QS
+           && state != SCE_RB_CHARACTER;
 }
 
-static bool isEmptyLine(Sci_Position pos,
-                        Accessor &styler) {
+inline bool isSingleSpecialVariable(char ch) noexcept {
+    // https://docs.ruby-lang.org/en/master/globals_rdoc.html
+    return strchr("~*$?!@/\\;,.=:<>\"&`'+", ch) != nullptr;
+}
+
+void InterpolateVariable(LexAccessor &styler, int state, Sci_Position &i, char &ch, char &chNext, char chNext2) {
+    Sci_Position pos = i;
+    styler.ColourTo(pos - 1, state);
+    styler.ColourTo(pos, SCE_RB_OPERATOR);
+    state = SCE_RB_GLOBAL;
+    pos += 2;
+    unsigned len = 0;
+    if (chNext == '$') {
+        if (chNext2 == '-') {
+            ++pos;
+            len = 2;
+        } else if (isSingleSpecialVariable(chNext2)) {
+            ++pos;
+            len = 1;
+        }
+    } else {
+        state = SCE_RB_INSTANCE_VAR;
+        if (chNext2 == '@') {
+            state = SCE_RB_CLASS_VAR;
+            ++pos;
+        }
+    }
+    while (true) {
+        chNext2 = styler.SafeGetCharAt(pos);
+        --len;
+        if (len == 0 || !isSafeWordcharOrHigh(chNext2)) {
+            break;
+        }
+        ++pos;
+    }
+    --pos;
+    styler.ColourTo(pos, state);
+    i = pos;
+    ch = chNext;
+    chNext = chNext2;
+}
+
+bool isEmptyLine(Sci_Position pos, Accessor &styler) {
     int spaceFlags = 0;
-    Sci_Position lineCurrent = styler.GetLine(pos);
-    int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+    const Sci_Position lineCurrent = styler.GetLine(pos);
+    const int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, nullptr);
     return (indentCurrent & SC_FOLDLEVELWHITEFLAG) != 0;
 }
 
-static bool RE_CanFollowKeyword(const char *keyword) {
+bool RE_CanFollowKeyword(const char *keyword) noexcept {
     if (!strcmp(keyword, "and")
             || !strcmp(keyword, "begin")
             || !strcmp(keyword, "break")
@@ -350,11 +388,9 @@ static bool RE_CanFollowKeyword(const char *keyword) {
 // Look at chars up to but not including endPos
 // Don't look at styles in case we're looking forward
 
-static Sci_Position skipWhitespace(Sci_Position startPos,
-                          Sci_Position endPos,
-                          Accessor &styler) {
+Sci_Position skipWhitespace(Sci_Position startPos, Sci_Position endPos, Accessor &styler) {
     for (Sci_Position i = startPos; i < endPos; i++) {
-        if (!iswhitespace(styler[i])) {
+        if (!IsASpaceOrTab(styler[i])) {
             return i;
         }
     }
@@ -367,26 +403,25 @@ static Sci_Position skipWhitespace(Sci_Position startPos,
 //
 // iPrev points to the start of <<
 
-static bool sureThisIsHeredoc(Sci_Position iPrev,
-                              Accessor &styler,
-                              char *prevWord) {
+bool sureThisIsHeredoc(Sci_Position iPrev, Accessor &styler, char *prevWord) {
 
     // Not so fast, since Ruby's so dynamic.  Check the context
     // to make sure we're OK.
     int prevStyle;
-    Sci_Position lineStart = styler.GetLine(iPrev);
-    Sci_Position lineStartPosn = styler.LineStart(lineStart);
+    const Sci_Position lineStart = styler.GetLine(iPrev);
+    const Sci_Position lineStartPosn = styler.LineStart(lineStart);
     styler.Flush();
 
     // Find the first word after some whitespace
-    Sci_Position firstWordPosn = skipWhitespace(lineStartPosn, iPrev, styler);
+    const Sci_Position firstWordPosn = skipWhitespace(lineStartPosn, iPrev, styler);
     if (firstWordPosn >= iPrev) {
         // Have something like {^     <<}
         //XXX Look at the first previous non-comment non-white line
         // to establish the context.  Not too likely though.
         return true;
     } else {
-        switch (prevStyle = styler.StyleAt(firstWordPosn)) {
+        prevStyle = styler.StyleAt(firstWordPosn);
+        switch (prevStyle) {
         case SCE_RB_WORD:
         case SCE_RB_WORD_DEMOTED:
         case SCE_RB_IDENTIFIER:
@@ -418,16 +453,11 @@ static bool sureThisIsHeredoc(Sci_Position iPrev,
 
 // Routine that saves us from allocating a buffer for the here-doc target
 // targetEndPos points one past the end of the current target
-static bool haveTargetMatch(Sci_Position currPos,
-                            Sci_Position lengthDoc,
-                            Sci_Position targetStartPos,
-                            Sci_Position targetEndPos,
-                            Accessor &styler) {
+bool haveTargetMatch(Sci_Position currPos, Sci_Position lengthDoc, Sci_Position targetStartPos, Sci_Position targetEndPos, Accessor &styler) {
     if (lengthDoc - currPos < targetEndPos - targetStartPos) {
         return false;
     }
-    Sci_Position i, j;
-    for (i = targetStartPos, j = currPos;
+    for (Sci_Position i = targetStartPos, j = currPos;
             i < targetEndPos && j < lengthDoc;
             i++, j++) {
         if (styler[i] != styler[j]) {
@@ -439,14 +469,12 @@ static bool haveTargetMatch(Sci_Position currPos,
 
 // Finds the start position of the expression containing @p pos
 // @p min_pos should be a known expression start, e.g. the start of the line
-static Sci_Position findExpressionStart(Sci_Position pos,
-                                        Sci_Position min_pos,
-                                        Accessor &styler) {
+Sci_Position findExpressionStart(Sci_Position pos, Sci_Position min_pos, Accessor &styler) {
     int depth = 0;
     for (; pos > min_pos; pos -= 1) {
-        int style = styler.StyleAt(pos - 1);
+        const int style = styler.StyleAt(pos - 1);
         if (style == SCE_RB_OPERATOR) {
-            int ch = styler[pos - 1];
+            const int ch = styler[pos - 1];
             if (ch == '}' || ch == ')' || ch == ']') {
                 depth += 1;
             } else if (ch == '{' || ch == '(' || ch == '[') {
@@ -477,18 +505,17 @@ static Sci_Position findExpressionStart(Sci_Position pos,
 
 // return true == yes, we have no heredocs
 
-static bool sureThisIsNotHeredoc(Sci_Position lt2StartPos,
-                                 Accessor &styler) {
+bool sureThisIsNotHeredoc(Sci_Position lt2StartPos, Accessor &styler) {
     // Use full document, not just part we're styling
-    Sci_Position lengthDoc = styler.Length();
-    Sci_Position lineStart = styler.GetLine(lt2StartPos);
-    Sci_Position lineStartPosn = styler.LineStart(lineStart);
+    const Sci_Position lengthDoc = styler.Length();
+    const Sci_Position lineStart = styler.GetLine(lt2StartPos);
+    const Sci_Position lineStartPosn = styler.LineStart(lineStart);
     styler.Flush();
-    const bool definitely_not_a_here_doc = true;
-    const bool looks_like_a_here_doc = false;
+    constexpr bool definitely_not_a_here_doc = true;
+    constexpr bool looks_like_a_here_doc = false;
 
     // find the expression start rather than the line start
-    Sci_Position exprStartPosn = findExpressionStart(lt2StartPos, lineStartPosn, styler);
+    const Sci_Position exprStartPosn = findExpressionStart(lt2StartPos, lineStartPosn, styler);
 
     // Find the first word after some whitespace
     Sci_Position firstWordPosn = skipWhitespace(exprStartPosn, lt2StartPos, styler);
@@ -516,7 +543,7 @@ static bool sureThisIsNotHeredoc(Sci_Position lt2StartPos,
         }
         // Do we have '::' or '.'?
         if (firstWordPosn < lt2StartPos && newStyle == SCE_RB_OPERATOR) {
-            char ch = styler[firstWordPosn];
+            const char ch = styler[firstWordPosn];
             if (ch == '.') {
                 // yes
             } else if (ch == ':') {
@@ -557,7 +584,7 @@ static bool sureThisIsNotHeredoc(Sci_Position lt2StartPos,
         // This shouldn't happen
         return definitely_not_a_here_doc;
     }
-    Sci_Position nextLineStartPosn = styler.LineStart(lineStart + 1);
+    const Sci_Position nextLineStartPosn = styler.LineStart(lineStart + 1);
     if (nextLineStartPosn >= lengthDoc) {
         return definitely_not_a_here_doc;
     }
@@ -566,7 +593,8 @@ static bool sureThisIsNotHeredoc(Sci_Position lt2StartPos,
         return definitely_not_a_here_doc;
     }
     bool allow_indent;
-    Sci_Position target_start, target_end;
+    Sci_Position target_start;
+    Sci_Position target_end;
     // From this point on no more styling, since we're looking ahead
     if (styler[j] == '-' || styler[j] == '~') {
         allow_indent = true;
@@ -612,7 +640,7 @@ static bool sureThisIsNotHeredoc(Sci_Position lt2StartPos,
             if (j >= lengthDoc) {
                 return definitely_not_a_here_doc;
             } else {
-                char ch = styler[j];
+                const char ch = styler[j];
                 if (ch == '#' || isEOLChar(ch) || ch == '.' || ch == ',') {
                     // This is OK, so break and continue;
                     break;
@@ -630,10 +658,9 @@ static bool sureThisIsNotHeredoc(Sci_Position lt2StartPos,
         last_line = lineStart + 50;
     }
     for (Sci_Position line_num = lineStart + 1; line_num <= last_line; line_num++) {
+        j = styler.LineStart(line_num);
         if (allow_indent) {
-            j = skipWhitespace(styler.LineStart(line_num), lengthDoc, styler);
-        } else {
-            j = styler.LineStart(line_num);
+            j = skipWhitespace(j, lengthDoc, styler);
         }
         // target_end is one past the end
         if (haveTargetMatch(j, lengthDoc, target_start, target_end, styler)) {
@@ -648,14 +675,10 @@ static bool sureThisIsNotHeredoc(Sci_Position lt2StartPos,
 // move to the start of the first line that is not in a
 // multi-line construct
 
-static void synchronizeDocStart(Sci_PositionU &startPos,
-                                Sci_Position &length,
-                                int &initStyle,
-                                Accessor &styler,
-                                bool skipWhiteSpace=false) {
+void synchronizeDocStart(Sci_PositionU &startPos, Sci_Position &length, int &initStyle, Accessor &styler, bool skipWhiteSpace=false) {
 
     styler.Flush();
-    int style = actual_style(styler.StyleAt(startPos));
+    const int style = actual_style(styler.StyleAt(startPos));
     switch (style) {
     case SCE_RB_STDIN:
     case SCE_RB_STDOUT:
@@ -674,8 +697,8 @@ static void synchronizeDocStart(Sci_PositionU &startPos,
             lineStart = 0;
             break;
         }
-        char ch = styler.SafeGetCharAt(pos);
-        char chPrev = styler.SafeGetCharAt(pos - 1);
+        const char ch = styler.SafeGetCharAt(pos);
+        const char chPrev = styler.SafeGetCharAt(pos - 1);
         if (ch == '\n' && chPrev == '\r') {
             pos--;
         }
@@ -698,8 +721,7 @@ static void synchronizeDocStart(Sci_PositionU &startPos,
     initStyle = SCE_RB_DEFAULT;
 }
 
-static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
-                           WordList *keywordlists[], Accessor &styler) {
+void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *keywordlists[], Accessor &styler) {
 
     // Lexer for Ruby often has to backtrack to start of current style to determine
     // which characters are being used as quotes, how deeply nested is the
@@ -728,13 +750,12 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
     int numDots = 0;  // For numbers --
     // Don't start lexing in the middle of a num
 
-    synchronizeDocStart(startPos, length, initStyle, styler, // ref args
-                        false);
+    synchronizeDocStart(startPos, length, initStyle, styler, false);
 
     bool preferRE = true;
     bool afterDef = false;
     int state = initStyle;
-    Sci_Position lengthDoc = startPos + length;
+    const Sci_Position lengthDoc = startPos + length;
 
     char prevWord[MAX_KEYWORD_LENGTH + 1] = ""; // 1 byte for zero
     if (length == 0)
@@ -746,14 +767,18 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
     styler.StartAt(startPos);
     styler.StartSegment(startPos);
 
-    static int q_states[] = {SCE_RB_STRING_Q,
-                             SCE_RB_STRING_QQ,
-                             SCE_RB_STRING_QR,
-                             SCE_RB_STRING_QW,
-                             SCE_RB_STRING_QW,
-                             SCE_RB_STRING_QX
-                            };
-    static const char *q_chars = "qQrwWx";
+    static constexpr int q_states[] = {
+        SCE_RB_STRING_Q,
+        SCE_RB_STRING_QQ,
+        SCE_RB_STRING_QR,
+        SCE_RB_STRING_W,
+        SCE_RB_STRING_QW,
+        SCE_RB_STRING_QX,
+        SCE_RB_STRING_I,
+        SCE_RB_STRING_QI,
+        SCE_RB_STRING_QS,
+    };
+    constexpr const char *q_chars = "qQrwWxiIs";
 
     // In most cases a value of 2 should be ample for the code in the
     // Ruby library, and the code the user is likely to enter.
@@ -773,20 +798,41 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
     // is invoked.
 
 #define INNER_STRINGS_MAX_COUNT 5
-    // These vars track our instances of "...#{,,,%Q<..#{,,,}...>,,,}..."
-    int inner_string_types[INNER_STRINGS_MAX_COUNT] {};
-    // Track # braces when we push a new #{ thing
-    int inner_expn_brace_counts[INNER_STRINGS_MAX_COUNT] {};
-    QuoteCls inner_quotes[INNER_STRINGS_MAX_COUNT];
-    int inner_string_count = 0;
-    int brace_counts = 0;   // Number of #{ ... } things within an expression
+    class InnerExpression {
+        // These vars track our instances of "...#{,,,%Q<..#{,,,}...>,,,}..."
+        int inner_string_types[INNER_STRINGS_MAX_COUNT] {};
+        // Track # braces when we push a new #{ thing
+        int inner_expn_brace_counts[INNER_STRINGS_MAX_COUNT] {};
+        QuoteCls inner_quotes[INNER_STRINGS_MAX_COUNT];
+        int inner_string_count = 0;
 
-    Sci_Position i;
-    for (i = 0; i < INNER_STRINGS_MAX_COUNT; i++) {
-        inner_string_types[i] = 0;
-        inner_expn_brace_counts[i] = 0;
-    }
-    for (i = startPos; i < lengthDoc; i++) {
+    public:
+        int brace_counts = 0;   // Number of #{ ... } things within an expression
+
+        bool canEnter() const noexcept {
+            return inner_string_count < INNER_STRINGS_MAX_COUNT;
+        }
+        bool canExit() const noexcept {
+            return inner_string_count > 0;
+        }
+        void enter(int &state, const QuoteCls &curr_quote) noexcept {
+            inner_string_types[inner_string_count] = state;
+            state = SCE_RB_DEFAULT;
+            inner_expn_brace_counts[inner_string_count] = brace_counts;
+            brace_counts = 0;
+            inner_quotes[inner_string_count] = curr_quote;
+            ++inner_string_count;
+        }
+        void exit(int &state, QuoteCls &curr_quote) noexcept {
+            --inner_string_count;
+            state = inner_string_types[inner_string_count];
+            brace_counts = inner_expn_brace_counts[inner_string_count];
+            curr_quote = inner_quotes[inner_string_count];
+        }
+    };
+    InnerExpression innerExpr;
+
+    for (Sci_Position i = startPos; i < lengthDoc; i++) {
         char ch = chNext;
         chNext = styler.SafeGetCharAt(i + 1);
         char chNext2 = styler.SafeGetCharAt(i + 2);
@@ -818,7 +864,14 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
             }
             // Don't check for a missing quote, just jump into
             // the here-doc state
-            state = SCE_RB_HERE_Q;
+            state = SCE_RB_HERE_QQ;
+            if (HereDoc.Quoted) {
+                if (HereDoc.Quote == '\'') {
+                    state = SCE_RB_HERE_Q;
+                } else if (HereDoc.Quote == '`') {
+                    state = SCE_RB_HERE_QX;
+                }
+            }
         }
 
         // Regular transitions
@@ -948,7 +1001,7 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
                     i += 3;
                     ch = styler.SafeGetCharAt(i);
                     chNext = styler.SafeGetCharAt(i+1);
-                } else if (chNext == '$' && strchr("_~*$?!@/\\;,.=:<>\"&`'+", chNext2)) {
+                } else if (chNext == '$' && isSingleSpecialVariable(chNext2)) {
                     // single-character special global variables
                     i += 2;
                     ch = chNext2;
@@ -962,7 +1015,7 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
                     switch (chNext) {
                     case '[':
                         if (chNext2 == ']') {
-                            char ch_tmp = styler.SafeGetCharAt(i + 3);
+                            const char ch_tmp = styler.SafeGetCharAt(i + 3);
                             if (ch_tmp == '=') {
                                 i += 3;
                                 ch = ch_tmp;
@@ -1003,7 +1056,7 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
                             ch = chNext2;
                             chNext = styler.SafeGetCharAt(i + 1);
                         } else if (chNext2 == '=') {
-                            char ch_tmp = styler.SafeGetCharAt(i + 3);
+                            const char ch_tmp = styler.SafeGetCharAt(i + 3);
                             if (ch_tmp == '>') {  // <=> operator
                                 i += 3;
                                 ch = ch_tmp;
@@ -1040,26 +1093,16 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
             } else if (ch == '%' && !afterDef) {
                 styler.ColourTo(i - 1, state);
                 bool have_string = false;
-                if (strchr(q_chars, chNext) && !isSafeWordcharOrHigh(chNext2)) {
+                const char *hit = strchr(q_chars, chNext);
+                if (hit != nullptr && !isSafeWordcharOrHigh(chNext2)) {
                     Quote.New();
-                    const char *hit = strchr(q_chars, chNext);
-                    if (hit != NULL) {
-                        state = q_states[hit - q_chars];
-                        Quote.Open(chNext2);
-                        i += 2;
-                        ch = chNext2;
-                        chNext = styler.SafeGetCharAt(i + 1);
-                        have_string = true;
-                    }
-                } else if (preferRE && !isSafeWordcharOrHigh(chNext)) {
-                    // Ruby doesn't allow high bit chars here,
-                    // but the editor host might
-                    Quote.New();
-                    state = SCE_RB_STRING_QQ;
-                    Quote.Open(chNext);
-                    advance_char(i, ch, chNext, chNext2); // pass by ref
+                    state = q_states[hit - q_chars];
+                    Quote.Open(chNext2);
+                    i += 2;
+                    ch = chNext2;
+                    chNext = styler.SafeGetCharAt(i + 1);
                     have_string = true;
-                } else if (!isSafeWordcharOrHigh(chNext) && !iswhitespace(chNext) && !isEOLChar(chNext)) {
+                } else if ((preferRE || (!isWhiteSpace(chNext) && chNext != '=')) && !isSafeWordcharOrHigh(chNext)) {
                     // Ruby doesn't allow high bit chars here,
                     // but the editor host might
                     Quote.New();
@@ -1120,18 +1163,14 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
                 // like : << / are unary operators.
 
                 if (ch == '{') {
-                    ++brace_counts;
+                    ++innerExpr.brace_counts;
                     preferRE = true;
-                } else if (ch == '}' && --brace_counts < 0
-                           && inner_string_count > 0) {
+                } else if (ch == '}' && --innerExpr.brace_counts < 0
+                           && innerExpr.canExit()) {
                     styler.ColourTo(i, SCE_RB_OPERATOR);
-                    exitInnerExpression(inner_string_types,
-                                        inner_expn_brace_counts,
-                                        inner_quotes,
-                                        inner_string_count,
-                                        state, brace_counts, Quote);
+                    innerExpr.exit(state, Quote);
                 } else {
-                    preferRE = (strchr(")}].", ch) == NULL);
+                    preferRE = !AnyOf(ch, ')', '}', ']', '.');
                 }
                 // Stay in default state
             } else if (isEOLChar(ch)) {
@@ -1158,7 +1197,7 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
                 if (ch == '='
                         && isSafeWordcharOrHigh(chPrev)
                         && (chNext == '('
-                            || strchr(" \t\n\r", chNext) != NULL)
+                            || isWhiteSpace(chNext))
                         && (!strcmp(prevWord, "def")
                             || followsDot(styler.GetStartSegment(), styler))) {
                     // <name>= is a name only when being def'd -- Get it the next time
@@ -1166,8 +1205,11 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
                     // <name>, (op, =), <name>
                 } else if (ch == ':'
                            && isSafeWordcharOrHigh(chPrev)
-                           && strchr(" \t\n\r", chNext) != NULL) {
-                    state = SCE_RB_SYMBOL;
+                           && isWhiteSpace(chNext)) {
+                    // keyword argument, symbol Hash key
+                    styler.ColourTo(i, SCE_RB_SYMBOL);
+                    state = SCE_RB_DEFAULT;
+                    preferRE = true;
                 } else if ((ch == '?' || ch == '!')
                            && isSafeWordcharOrHigh(chPrev)
                            && !isSafeWordcharOrHigh(chNext)) {
@@ -1183,8 +1225,8 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
                     // No need to handle this state -- we'll just move to the end
                     preferRE = false;
                 } else {
-                    Sci_Position wordStartPos = styler.GetStartSegment();
-                    int word_style = ClassifyWordRb(wordStartPos, i - 1, ch, keywords, styler, prevWord);
+                    const Sci_Position wordStartPos = styler.GetStartSegment();
+                    const int word_style = ClassifyWordRb(wordStartPos, i - 1, ch, keywords, styler, prevWord);
                     switch (word_style) {
                     case SCE_RB_WORD:
                         afterDef = strcmp(prevWord, "def") == 0;
@@ -1192,24 +1234,20 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
                         break;
 
                     case SCE_RB_WORD_DEMOTED:
+                    case SCE_RB_DEFNAME:
+                    case SCE_RB_IDENTIFIER_PREFERRE:
                         preferRE = true;
                         break;
 
                     case SCE_RB_IDENTIFIER:
-                        if (isMatch(styler, lengthDoc, wordStartPos, "print")) {
-                            preferRE = true;
-                        } else if (isEOLChar(ch)) {
-                            preferRE = true;
-                        } else {
-                            preferRE = false;
-                        }
+                        preferRE = isEOLChar(ch);
                         break;
+
                     default:
                         preferRE = false;
                     }
                     if (ch == '.') {
                         // We might be redefining an operator-method
-                        preferRE = false;
                         afterDef = word_style == SCE_RB_DEFNAME;
                     }
                     // And if it's the first
@@ -1333,14 +1371,33 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
                     preferRE = false;
                 }
             }
-        } else if (state == SCE_RB_HERE_Q) {
+        } else if (state == SCE_RB_HERE_Q || state == SCE_RB_HERE_QQ || state == SCE_RB_HERE_QX) {
+            if (ch == '\\' && !isEOLChar(chNext)) {
+                advance_char(i, ch, chNext, chNext2);
+            } else if (ch == '#' && state != SCE_RB_HERE_Q
+                       && (chNext == '{' || chNext == '@' || chNext == '$')) {
+                if (chNext == '{') {
+                    if (innerExpr.canEnter()) {
+                        // process #{ ... }
+                        styler.ColourTo(i - 1, state);
+                        styler.ColourTo(i + 1, SCE_RB_OPERATOR);
+                        innerExpr.enter(state, Quote);
+                        preferRE = true;
+                        // Skip one
+                        advance_char(i, ch, chNext, chNext2);
+                    }
+                } else {
+                    InterpolateVariable(styler, state, i, ch, chNext, chNext2);
+                }
+            }
+
             // Not needed: HereDoc.State == 2
             // Indentable here docs: look backwards
             // Non-indentable: look forwards, like in Perl
             //
             // Why: so we can quickly resolve things like <<-" abc"
 
-            if (!HereDoc.CanBeIndented) {
+            else if (!HereDoc.CanBeIndented) {
                 if (isEOLChar(chPrev)
                         && isMatch(styler, lengthDoc, i, HereDoc.Delimiter)) {
                     styler.ColourTo(i - 1, state);
@@ -1400,7 +1457,7 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
             }
         } else if (state == SCE_RB_POD) {
             // PODs end with ^=end\s, -- any whitespace can follow =end
-            if (strchr(" \t\n\r", ch) != NULL
+            if (isWhiteSpace(ch)
                     && i > 5
                     && isEOLChar(styler[i - 5])
                     && isMatch(styler, lengthDoc, i - 4, "=end")) {
@@ -1430,21 +1487,18 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
                 Quote.Count++;
 
             } else if (ch == '#') {
-                if (chNext == '{'
-                        && inner_string_count < INNER_STRINGS_MAX_COUNT) {
-                    // process #{ ... }
-                    styler.ColourTo(i - 1, state);
-                    styler.ColourTo(i + 1, SCE_RB_OPERATOR);
-                    enterInnerExpression(inner_string_types,
-                                         inner_expn_brace_counts,
-                                         inner_quotes,
-                                         inner_string_count,
-                                         state,
-                                         brace_counts,
-                                         Quote);
-                    preferRE = true;
-                    // Skip one
-                    advance_char(i, ch, chNext, chNext2);
+                if (chNext == '{') {
+                    if (innerExpr.canEnter()) {
+                        // process #{ ... }
+                        styler.ColourTo(i - 1, state);
+                        styler.ColourTo(i + 1, SCE_RB_OPERATOR);
+                        innerExpr.enter(state, Quote);
+                        preferRE = true;
+                        // Skip one
+                        advance_char(i, ch, chNext, chNext2);
+                    }
+                } else if (chNext == '@' || chNext == '$') {
+                    InterpolateVariable(styler, state, i, ch, chNext, chNext2);
                 } else {
                     //todo: distinguish comments from pound chars
                     // for now, handle as comment
@@ -1472,8 +1526,7 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
                 }
             }
             // Quotes of all kinds...
-        } else if (state == SCE_RB_STRING_Q || state == SCE_RB_STRING_QQ ||
-                   state == SCE_RB_STRING_QX || state == SCE_RB_STRING_QW ||
+        } else if (isPercentLiteral(state) ||
                    state == SCE_RB_STRING || state == SCE_RB_CHARACTER ||
                    state == SCE_RB_BACKTICKS) {
             if (!Quote.Down && !isspacechar(ch)) {
@@ -1490,23 +1543,20 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
                 }
             } else if (ch == Quote.Up) {
                 Quote.Count++;
-            } else if (ch == '#' && chNext == '{'
-                       && inner_string_count < INNER_STRINGS_MAX_COUNT
-                       && state != SCE_RB_CHARACTER
-                       && state != SCE_RB_STRING_Q) {
-                // process #{ ... }
-                styler.ColourTo(i - 1, state);
-                styler.ColourTo(i + 1, SCE_RB_OPERATOR);
-                enterInnerExpression(inner_string_types,
-                                     inner_expn_brace_counts,
-                                     inner_quotes,
-                                     inner_string_count,
-                                     state,
-                                     brace_counts,
-                                     Quote);
-                preferRE = true;
-                // Skip one
-                advance_char(i, ch, chNext, chNext2);
+            } else if (ch == '#' && isInterpolableLiteral(state)) {
+                if (chNext == '{') {
+                    if (innerExpr.canEnter()) {
+                        // process #{ ... }
+                        styler.ColourTo(i - 1, state);
+                        styler.ColourTo(i + 1, SCE_RB_OPERATOR);
+                        innerExpr.enter(state, Quote);
+                        preferRE = true;
+                        // Skip one
+                        advance_char(i, ch, chNext, chNext2);
+                    }
+                } else if (chNext == '@' || chNext == '$') {
+                    InterpolateVariable(styler, state, i, ch, chNext, chNext2);
+                }
             }
         }
 
@@ -1518,7 +1568,7 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
     if (state == SCE_RB_WORD) {
         // We've ended on a word, possibly at EOF, and need to
         // classify it.
-        (void) ClassifyWordRb(styler.GetStartSegment(), lengthDoc - 1, '\0', keywords, styler, prevWord);
+        ClassifyWordRb(styler.GetStartSegment(), lengthDoc - 1, '\0', keywords, styler, prevWord);
     } else {
         styler.ColourTo(lengthDoc - 1, state);
     }
@@ -1527,11 +1577,7 @@ static void ColouriseRbDoc(Sci_PositionU startPos, Sci_Position length, int init
 // Helper functions for folding, disambiguation keywords
 // Assert that there are no high-bit chars
 
-static void getPrevWord(Sci_Position pos,
-                        char *prevWord,
-                        Accessor &styler,
-                        int word_state)
-{
+void getPrevWord(Sci_Position pos, char *prevWord, Accessor &styler, int word_state) {
     Sci_Position i;
     styler.Flush();
     for (i = pos - 1; i > 0; i--) {
@@ -1549,8 +1595,7 @@ static void getPrevWord(Sci_Position pos,
     *dst = 0;
 }
 
-static bool keywordIsAmbiguous(const char *prevWord)
-{
+bool keywordIsAmbiguous(const char *prevWord) noexcept {
     // Order from most likely used to least likely
     // Lots of ways to do a loop in Ruby besides 'while/until'
     if (!strcmp(prevWord, "if")
@@ -1569,14 +1614,11 @@ static bool keywordIsAmbiguous(const char *prevWord)
 // if, while, unless, until modify a statement
 // do after a while or until, as a noise word (like then after if)
 
-static bool keywordIsModifier(const char *word,
-                              Sci_Position pos,
-                              Accessor &styler)
-{
+bool keywordIsModifier(const char *word, Sci_Position pos, Accessor &styler) {
     if (word[0] == 'd' && word[1] == 'o' && !word[2]) {
         return keywordDoStartsLoop(pos, styler);
     }
-    char ch, chPrev, chPrev2;
+    char ch;
     int style = SCE_RB_DEFAULT;
     Sci_Position lineStart = styler.GetLine(pos);
     Sci_Position lineStartPosn = styler.LineStart(lineStart);
@@ -1586,8 +1628,8 @@ static bool keywordIsModifier(const char *word,
     while (lineStartPosn > 0) {
         ch = styler[lineStartPosn-1];
         if (ch == '\n' || ch == '\r') {
-            chPrev  = styler.SafeGetCharAt(lineStartPosn-2);
-            chPrev2 = styler.SafeGetCharAt(lineStartPosn-3);
+            const char chPrev  = styler.SafeGetCharAt(lineStartPosn-2);
+            const char chPrev2 = styler.SafeGetCharAt(lineStartPosn-3);
             lineStart = styler.GetLine(lineStartPosn-1);
             // If we find a continuation line, include it in our analysis.
             if (chPrev == '\\') {
@@ -1606,7 +1648,8 @@ static bool keywordIsModifier(const char *word,
     while (--pos >= lineStartPosn) {
         style = actual_style(styler.StyleAt(pos));
         if (style == SCE_RB_DEFAULT) {
-            if (iswhitespace(ch = styler[pos])) {
+            ch = styler[pos];
+            if (IsASpaceOrTab(ch)) {
                 //continue
             } else if (ch == '\r' || ch == '\n') {
                 // Scintilla's LineStart() and GetLine() routines aren't
@@ -1615,8 +1658,8 @@ static bool keywordIsModifier(const char *word,
 
                 // Also, lineStartPosn may have been moved to more than one
                 // line above word's line while pushing past continuations.
-                chPrev = styler.SafeGetCharAt(pos - 1);
-                chPrev2 = styler.SafeGetCharAt(pos - 2);
+                const char chPrev = styler.SafeGetCharAt(pos - 1);
+                const char chPrev2 = styler.SafeGetCharAt(pos - 2);
                 if (chPrev == '\\') {
                     pos-=1;  // gloss over the "\\"
                     //continue
@@ -1681,17 +1724,15 @@ static bool keywordIsModifier(const char *word,
 // Nothing fancy -- look to see if we follow a while/until somewhere
 // on the current line
 
-static bool keywordDoStartsLoop(Sci_Position pos,
-                                Accessor &styler)
-{
-    char ch;
-    Sci_Position lineStart = styler.GetLine(pos);
-    Sci_Position lineStartPosn = styler.LineStart(lineStart);
+bool keywordDoStartsLoop(Sci_Position pos, Accessor &styler) {
+    const Sci_Position lineStart = styler.GetLine(pos);
+    const Sci_Position lineStartPosn = styler.LineStart(lineStart);
     styler.Flush();
     while (--pos >= lineStartPosn) {
         const int style = actual_style(styler.StyleAt(pos));
         if (style == SCE_RB_DEFAULT) {
-            if ((ch = styler[pos]) == '\r' || ch == '\n') {
+            const char ch = styler[pos];
+            if (ch == '\r' || ch == '\n') {
                 // Scintilla's LineStart() and GetLine() routines aren't
                 // platform-independent, so if we have text prepared with
                 // a different system we can't rely on it.
@@ -1732,11 +1773,11 @@ static bool keywordDoStartsLoop(Sci_Position pos,
     return false;
 }
 
-static bool IsCommentLine(Sci_Position line, Accessor &styler) {
-    Sci_Position pos = styler.LineStart(line);
-    Sci_Position eol_pos = styler.LineStart(line + 1) - 1;
+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++) {
-        char ch = styler[i];
+        const char ch = styler[i];
         if (ch == '#')
             return true;
         else if (ch != ' ' && ch != '\t')
@@ -1799,14 +1840,12 @@ static bool IsCommentLine(Sci_Position line, Accessor &styler) {
  *  Later offer to fold POD, here-docs, strings, and blocks of comments
  */
 
-static void FoldRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle,
-                      WordList *[], Accessor &styler) {
+void FoldRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle, WordList *[], Accessor &styler) {
     const bool foldCompact = styler.GetPropertyInt("fold.compact", 1) != 0;
-    bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
+    const bool foldComment = styler.GetPropertyInt("fold.comment") != 0;
 
-    synchronizeDocStart(startPos, length, initStyle, styler, // ref args
-                        false);
-    Sci_PositionU endPos = startPos + length;
+    synchronizeDocStart(startPos, length, initStyle, styler, false);
+    const Sci_PositionU endPos = startPos + length;
     int visibleChars = 0;
     Sci_Position lineCurrent = styler.GetLine(startPos);
     int levelPrev = startPos == 0 ? 0 : (styler.LevelAt(lineCurrent)
@@ -1827,13 +1866,14 @@ static void FoldRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle
     };
     MethodDefinition method_definition = MethodDefinition::None;
     int argument_paren_count = 0;
+    bool heredocOpen = false;
 
     for (Sci_PositionU i = startPos; i < endPos; i++) {
-        char ch = chNext;
+        const char ch = chNext;
         chNext = styler.SafeGetCharAt(i + 1);
-        int style = styleNext;
+        const int style = styleNext;
         styleNext = styler.StyleAt(i + 1);
-        bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
+        const bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n');
 
         /*Mutiline comment patch*/
         if (foldComment && atEOL && IsCommentLine(lineCurrent, styler)) {
@@ -1854,9 +1894,9 @@ static void FoldRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle
                 }
             }
         } else if (style == SCE_RB_OPERATOR) {
-            if (strchr("[{(", ch)) {
+            if (AnyOf(ch, '[', '{', '(')) {
                 levelCurrent++;
-            } else if (strchr(")}]", ch)) {
+            } else if (AnyOf(ch, ']', '}', ')')) {
                 // Don't decrement below 0
                 if (levelCurrent > 0)
                     levelCurrent--;
@@ -1886,16 +1926,18 @@ static void FoldRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle
                       ) {
                 levelCurrent++;
             }
-        } else if (style == SCE_RB_HERE_DELIM) {
-            if (styler.SafeGetCharAt(i-2) == '<' && styler.SafeGetCharAt(i-1) == '<') {
+        } else if (style == SCE_RB_HERE_DELIM && !heredocOpen) {
+            if (stylePrev == SCE_RB_OPERATOR && chPrev == '<' && styler.SafeGetCharAt(i - 2) == '<') {
                 levelCurrent++;
-            } else if (styleNext == SCE_RB_DEFAULT) {
+                heredocOpen = true;
+            } else if (styleNext != SCE_RB_HERE_DELIM) {
                 levelCurrent--;
             }
-        } else if (style == SCE_RB_STRING_QW) {
+        } else if (style == SCE_RB_STRING_QW || style == SCE_RB_STRING_W) {
             if (stylePrev != style) {
                 levelCurrent++;
-            } else if (styleNext != style) {
+            }
+            if (styleNext != style) {
                 levelCurrent--;
             }
         }
@@ -1961,6 +2003,7 @@ static void FoldRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle
             visibleChars = 0;
             method_definition = MethodDefinition::None;
             argument_paren_count = 0;
+            heredocOpen = false;
         } else if (!isspacechar(ch)) {
             visibleChars++;
         }
@@ -1969,9 +2012,11 @@ static void FoldRbDoc(Sci_PositionU startPos, Sci_Position length, int initStyle
     }
 }
 
-static const char *const rubyWordListDesc[] = {
+const char *const rubyWordListDesc[] = {
     "Keywords",
-    0
+    nullptr
 };
 
+}
+
 LexerModule lmRuby(SCLEX_RUBY, ColouriseRbDoc, "ruby", FoldRbDoc, rubyWordListDesc);
diff --git a/lexilla/lexers/LexYAML.cxx b/lexilla/lexers/LexYAML.cxx
index e26ebf882..0e21a77c0 100644
--- a/lexilla/lexers/LexYAML.cxx
+++ b/lexilla/lexers/LexYAML.cxx
@@ -5,12 +5,12 @@
 // Copyright 2003- by Sean O'Dell <sean@celsoft.com>
 // 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 <cstdio>
+#include <cstdarg>
 
 #include <string>
 #include <string_view>
@@ -28,12 +28,14 @@
 
 using namespace Lexilla;
 
-static const char * const yamlWordListDesc[] = {
+namespace {
+
+const char * const yamlWordListDesc[] = {
 	"Keywords",
-	0
+	nullptr
 };
 
-static inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
+inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
 	return (styler[i] == '\n') ||
 		((styler[i] == '\r') && (styler.SafeGetCharAt(i + 1) != '\n'));
 }
@@ -42,12 +44,12 @@ static inline bool AtEOL(Accessor &styler, Sci_PositionU i) {
  * Check for space, tab, line feed, or carriage return.
  * See YAML 1.2 spec sections 5.4. Line Break Characters and 5.5. White Space Characters.
  */
-static constexpr bool IsWhiteSpaceOrEOL(char ch) noexcept {
+constexpr bool IsWhiteSpaceOrEOL(char ch) noexcept {
 	return ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r';
 }
 
-static unsigned int SpaceCount(char* lineBuffer) {
-	if (lineBuffer == NULL)
+unsigned int SpaceCount(char* lineBuffer) noexcept {
+	if (lineBuffer == nullptr)
 		return 0;
 
 	char* headBuffer = lineBuffer;
@@ -58,8 +60,8 @@ static unsigned int SpaceCount(char* lineBuffer) {
 	return static_cast<unsigned int>(headBuffer - lineBuffer);
 }
 
-static bool KeywordAtChar(char* lineBuffer, char* startComment, const WordList &keywords) {
-	if (lineBuffer == NULL || startComment <= lineBuffer)
+bool KeywordAtChar(const char* lineBuffer, char* startComment, const WordList &keywords) noexcept {
+	if (lineBuffer == nullptr || startComment <= lineBuffer)
 		return false;
 	char* endValue = startComment - 1;
 	while (endValue >= lineBuffer && *endValue == ' ')
@@ -81,24 +83,24 @@ static bool KeywordAtChar(char* lineBuffer, char* startComment, const WordList &
 #define YAML_STATE_TEXT_PARENT	(4 << YAML_STATE_BITSIZE)
 #define YAML_STATE_TEXT			(5 << YAML_STATE_BITSIZE)
 
-static void ColouriseYAMLLine(
+void ColouriseYAMLLine(
 	char *lineBuffer,
 	Sci_PositionU currentLine,
 	Sci_PositionU lengthLine,
 	Sci_PositionU startLine,
 	Sci_PositionU endPos,
-	WordList &keywords,
+	const WordList &keywords,
 	Accessor &styler) {
 
 	Sci_PositionU i = 0;
 	bool bInQuotes = false;
-	unsigned int indentAmount = SpaceCount(lineBuffer);
+	const unsigned int indentAmount = SpaceCount(lineBuffer);
 
 	if (currentLine > 0) {
-		int parentLineState = styler.GetLineState(currentLine - 1);
+		const int parentLineState = styler.GetLineState(currentLine - 1);
 
 		if ((parentLineState&YAML_STATE_MASK) == YAML_STATE_TEXT || (parentLineState&YAML_STATE_MASK) == YAML_STATE_TEXT_PARENT) {
-			unsigned int parentIndentAmount = parentLineState&(~YAML_STATE_MASK);
+			const unsigned int parentIndentAmount = parentLineState&(~YAML_STATE_MASK);
 			if (indentAmount > parentIndentAmount) {
 				styler.SetLineState(currentLine, YAML_STATE_TEXT | parentIndentAmount);
 				styler.ColourTo(endPos, SCE_YAML_TEXT);
@@ -189,7 +191,7 @@ static void ColouriseYAMLLine(
 					styler.ColourTo(endPos, SCE_YAML_COMMENT);
 				return;
 			}
-			Sci_PositionU i2 = i;
+			const Sci_PositionU i2 = i;
 			while ((i < startComment) && lineBuffer[i]) {
 				if (!(IsASCII(lineBuffer[i]) && isdigit(lineBuffer[i])) && lineBuffer[i] != '-'
 				        && lineBuffer[i] != '.' && lineBuffer[i] != ',' && lineBuffer[i] != ' ') {
@@ -213,40 +215,38 @@ static void ColouriseYAMLLine(
 	styler.ColourTo(endPos, SCE_YAML_DEFAULT);
 }
 
-static void ColouriseYAMLDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) {
-	char lineBuffer[1024] = "";
+void ColouriseYAMLDoc(Sci_PositionU startPos, Sci_Position length, int, WordList *keywordLists[], Accessor &styler) {
+	std::string lineBuffer;
 	styler.StartAt(startPos);
 	styler.StartSegment(startPos);
-	Sci_PositionU linePos = 0;
 	Sci_PositionU startLine = startPos;
-	Sci_PositionU endPos = startPos + length;
-	Sci_PositionU maxPos = styler.Length();
+	const Sci_PositionU endPos = startPos + length;
+	const Sci_PositionU maxPos = styler.Length();
 	Sci_PositionU lineCurrent = styler.GetLine(startPos);
 
 	for (Sci_PositionU i = startPos; i < maxPos && i < endPos; i++) {
-		lineBuffer[linePos++] = styler[i];
-		if (AtEOL(styler, i) || (linePos >= sizeof(lineBuffer) - 1)) {
+		lineBuffer.push_back(styler[i]);
+		if (AtEOL(styler, i)) {
 			// End of line (or of line buffer) met, colourise it
-			lineBuffer[linePos] = '\0';
-			ColouriseYAMLLine(lineBuffer, lineCurrent, linePos, startLine, i, *keywordLists[0], styler);
-			linePos = 0;
+			ColouriseYAMLLine(lineBuffer.data(), lineCurrent, lineBuffer.length(), startLine, i, *keywordLists[0], styler);
+			lineBuffer.clear();
 			startLine = i + 1;
 			lineCurrent++;
 		}
 	}
-	if (linePos > 0) {	// Last line does not have ending characters
-		ColouriseYAMLLine(lineBuffer, lineCurrent, linePos, startLine, startPos + length - 1, *keywordLists[0], styler);
+	if (!lineBuffer.empty()) {	// Last line does not have ending characters
+		ColouriseYAMLLine(lineBuffer.data(), lineCurrent, lineBuffer.length(), startLine, startPos + length - 1, *keywordLists[0], styler);
 	}
 }
 
-static bool IsCommentLine(Sci_Position line, Accessor &styler) {
-	Sci_Position pos = styler.LineStart(line);
+bool IsCommentLine(Sci_Position line, Accessor &styler) {
+	const Sci_Position pos = styler.LineStart(line);
 	if (styler[pos] == '#')
 		return true;
 	return false;
 }
 
-static void FoldYAMLDoc(Sci_PositionU startPos, Sci_Position length, int /*initStyle - unused*/,
+void FoldYAMLDoc(Sci_PositionU startPos, Sci_Position length, int /*initStyle - unused*/,
                       WordList *[], Accessor &styler) {
 	const Sci_Position maxPos = startPos + length;
 	const Sci_Position maxLines = styler.GetLine(maxPos - 1);             // Requested last line
@@ -259,10 +259,10 @@ static void FoldYAMLDoc(Sci_PositionU startPos, Sci_Position length, int /*initS
 	// at least one line in all cases)
 	int spaceFlags = 0;
 	Sci_Position lineCurrent = styler.GetLine(startPos);
-	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+	int indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, nullptr);
 	while (lineCurrent > 0) {
 		lineCurrent--;
-		indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, NULL);
+		indentCurrent = styler.IndentAmount(lineCurrent, &spaceFlags, nullptr);
 		if (!(indentCurrent & SC_FOLDLEVELWHITEFLAG) &&
 		        (!IsCommentLine(lineCurrent, styler)))
 			break;
@@ -285,7 +285,7 @@ static void FoldYAMLDoc(Sci_PositionU startPos, Sci_Position length, int /*initS
 		int indentNext = indentCurrent;
 		if (lineNext <= docLines) {
 			// Information about next line is only available if not at end of document
-			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
+			indentNext = styler.IndentAmount(lineNext, &spaceFlags, nullptr);
 		}
 		const int comment = foldComment && IsCommentLine(lineCurrent, styler);
 		const int comment_start = (comment && !prevComment && (lineNext <= docLines) &&
@@ -314,7 +314,7 @@ static void FoldYAMLDoc(Sci_PositionU startPos, Sci_Position length, int /*initS
 		         (lineNext <= docLines && IsCommentLine(lineNext, styler)))) {
 
 			lineNext++;
-			indentNext = styler.IndentAmount(lineNext, &spaceFlags, NULL);
+			indentNext = styler.IndentAmount(lineNext, &spaceFlags, nullptr);
 		}
 
 		const int levelAfterComments = indentNext & SC_FOLDLEVELNUMBERMASK;
@@ -329,12 +329,12 @@ static void FoldYAMLDoc(Sci_PositionU startPos, Sci_Position length, int /*initS
 		int skipLevel = levelAfterComments;
 
 		while (--skipLine > lineCurrent) {
-			int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, NULL);
+			const int skipLineIndent = styler.IndentAmount(skipLine, &spaceFlags, nullptr);
 
 			if ((skipLineIndent & SC_FOLDLEVELNUMBERMASK) > levelAfterComments)
 				skipLevel = levelBeforeComments;
 
-			int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG;
+			const int whiteFlag = skipLineIndent & SC_FOLDLEVELWHITEFLAG;
 
 			styler.SetLevel(skipLine, skipLevel | whiteFlag);
 		}
@@ -359,4 +359,6 @@ static void FoldYAMLDoc(Sci_PositionU startPos, Sci_Position length, int /*initS
 	//styler.SetLevel(lineCurrent, indentCurrent);
 }
 
+}
+
 LexerModule lmYAML(SCLEX_YAML, ColouriseYAMLDoc, "yaml", FoldYAMLDoc, yamlWordListDesc);
diff --git a/lexilla/lexlib/StyleContext.cxx b/lexilla/lexlib/StyleContext.cxx
index 5dc46f6f4..532265ffc 100644
--- a/lexilla/lexlib/StyleContext.cxx
+++ b/lexilla/lexlib/StyleContext.cxx
@@ -89,3 +89,14 @@ void StyleContext::GetCurrent(char *s, Sci_PositionU len) {
 void StyleContext::GetCurrentLowered(char *s, Sci_PositionU len) {
 	styler.GetRangeLowered(styler.GetStartSegment(), currentPos, s, len);
 }
+
+void StyleContext::GetCurrentString(std::string &string, Transform transform) {
+	const Sci_PositionU startPos = styler.GetStartSegment();
+	const Sci_PositionU len = currentPos - styler.GetStartSegment();
+	string.resize(len);
+	if (transform == Transform::lower) {
+		styler.GetRangeLowered(startPos, currentPos, string.data(), len + 1);
+	} else {
+		styler.GetRange(startPos, currentPos, string.data(), len + 1);
+	}
+}
diff --git a/lexilla/lexlib/StyleContext.h b/lexilla/lexlib/StyleContext.h
index a06a330c0..2aa71082b 100644
--- a/lexilla/lexlib/StyleContext.h
+++ b/lexilla/lexlib/StyleContext.h
@@ -183,6 +183,8 @@ public:
 	bool MatchIgnoreCase2(const char *s);
 	void GetCurrent(char *s, Sci_PositionU len);
 	void GetCurrentLowered(char *s, Sci_PositionU len);
+	enum class Transform { none, lower };
+	void GetCurrentString(std::string &string, Transform transform);
 };
 
 }
diff --git a/lexilla/lexlib/WordList.cxx b/lexilla/lexlib/WordList.cxx
index 8b65ecc22..2d95aa660 100644
--- a/lexilla/lexlib/WordList.cxx
+++ b/lexilla/lexlib/WordList.cxx
@@ -9,6 +9,7 @@
 #include <cassert>
 #include <cstring>
 
+#include <string>
 #include <algorithm>
 #include <iterator>
 #include <memory>
@@ -182,6 +183,12 @@ bool WordList::InList(const char *s) const noexcept {
 	return false;
 }
 
+/** convenience overload so can easily call with std::string.
+ */
+bool WordList::InList(const std::string &s) const noexcept {
+	return InList(s.c_str());
+}
+
 /** similar to InList, but word s can be a substring of keyword.
  * eg. the keyword define is defined as def~ine. This means the word must start
  * with def to be a keyword, but also defi, defin and define are valid.
diff --git a/lexilla/lexlib/WordList.h b/lexilla/lexlib/WordList.h
index a434a4102..71d5bea02 100644
--- a/lexilla/lexlib/WordList.h
+++ b/lexilla/lexlib/WordList.h
@@ -33,6 +33,7 @@ public:
 	void Clear() noexcept;
 	bool Set(const char *s);
 	bool InList(const char *s) const noexcept;
+	bool InList(const std::string &s) const noexcept;
 	bool InListAbbreviated(const char *s, const char marker) const noexcept;
 	bool InListAbridged(const char *s, const char marker) const noexcept;
 	const char *WordAt(int n) const noexcept;
diff --git a/lexilla/scripts/PromoteNew.bat b/lexilla/scripts/PromoteNew.bat
new file mode 100644
index 000000000..1c91cc985
--- /dev/null
+++ b/lexilla/scripts/PromoteNew.bat
@@ -0,0 +1,23 @@
+@echo off
+rem Promote new result files.
+rem Find all the *.new files under test\examples and copy them to their expected name without ".new".
+rem Run after RunTest.bat if ".new" result files are correct.
+pushd ..\test\examples
+for /R %%f in (*.new) do (call :moveFile %%f)
+popd
+goto :eof
+
+:moveFile
+set pathWithNew=%1
+set directory=%~dp1
+set fileWithNew=%~nx1
+set fileNoNew=%~n1
+set pathNoNew=%pathWithNew:~0,-4%
+
+if exist %pathNoNew% (
+   echo Move %fileWithNew% to %fileNoNew% in %directory%
+) else (
+   echo New %fileWithNew% to %fileNoNew% in %directory%
+)
+move %pathWithNew% %pathNoNew%
+goto :eof
diff --git a/lexilla/src/Lexilla.vcxproj b/lexilla/src/Lexilla.vcxproj
index c2b0be9ce..f47331da9 100644
--- a/lexilla/src/Lexilla.vcxproj
+++ b/lexilla/src/Lexilla.vcxproj
@@ -90,7 +90,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>WIN32;SCI_LEXER;_CRT_SECURE_NO_DEPRECATE;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\include;..\..\scintilla\include;..\lexlib;</AdditionalIncludeDirectories>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/lexilla/src/Lexilla/Info.plist b/lexilla/src/Lexilla/Info.plist
index a875e78df..7e4119fc7 100644
--- a/lexilla/src/Lexilla/Info.plist
+++ b/lexilla/src/Lexilla/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.2.2</string>
+	<string>5.2.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj b/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
index 9a8a81b47..ed40fc7cd 100644
--- a/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
+++ b/lexilla/src/Lexilla/Lexilla.xcodeproj/project.pbxproj
@@ -768,6 +768,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -827,6 +828,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -851,7 +853,8 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.2.2;
+				CURRENT_PROJECT_VERSION = 5.2.4;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 4F446KW87E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -877,7 +880,8 @@
 			buildSettings = {
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.2.2;
+				CURRENT_PROJECT_VERSION = 5.2.4;
+				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 4F446KW87E;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
diff --git a/lexilla/src/LexillaVersion.rc b/lexilla/src/LexillaVersion.rc
index c6286c654..7a81b63d4 100644
--- a/lexilla/src/LexillaVersion.rc
+++ b/lexilla/src/LexillaVersion.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_LEXILLA "5.2.2"
-#define VERSION_WORDS 5, 2, 2, 0
+#define VERSION_LEXILLA "5.2.4"
+#define VERSION_WORDS 5, 2, 4, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff --git a/lexilla/src/lexilla.mak b/lexilla/src/lexilla.mak
index f36a7c872..5817a3cec 100644
--- a/lexilla/src/lexilla.mak
+++ b/lexilla/src/lexilla.mak
@@ -35,7 +35,7 @@ SUBSYSTEM=-SUBSYSTEM:WINDOWS,10.00
 !ENDIF
 !ENDIF
 
-CRTFLAGS=-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_NO_DEPRECATE=1 $(ADD_DEFINE)
+CRTFLAGS=-D_CRT_SECURE_NO_DEPRECATE=1 $(ADD_DEFINE)
 CXXFLAGS=-Zi -TP -MP -W4 -EHsc -std:c++17 $(CRTFLAGS)
 CXXDEBUG=-Od -MTd -DDEBUG
 CXXNDEBUG=-O2 -MT -DNDEBUG -GL
diff --git a/lexilla/test/README b/lexilla/test/README
index a8b906801..8cfb48523 100644
--- a/lexilla/test/README
+++ b/lexilla/test/README
@@ -77,6 +77,13 @@ picture: gives a rough idea of the fold structure: '|' for level greater than 0x
 After checking that the .folded.new file is correct, it can be promoted to .folded and
 committed to the repository.
 
+An interactive file comparison program like WinMerge (https://winmerge.org/) on
+Windows or meld (https://meldmerge.org/) on Linux can help examine differences
+between the .styled and .styled.new files or .folded and .folded.new files.
+
+On Windows, the scripts/PromoteNew.bat script can be run to promote all .new result
+files to their base names without .new.
+
 Styling and folding tests are first performed on the file as a whole, then the file is lexed
 and folded line-by-line. If there are differences between the whole file and line-by-line
 then a message with 'per-line is different' for styling or 'per-line has different folds' will be
@@ -94,6 +101,10 @@ Keywords may be defined with keywords settings like:
 	keywords.*.cxx;*.c=int char
 	keywords2.*.cxx=open
 
+Substyles and substyle identifiers may be defined with settings like:
+	substyles.cpp.11=1
+	substylewords.11.1.*.cxx=map string vector
+
 Other settings are treated as lexer or folder properties and forwarded to the lexer/folder:
 	lexer.cpp.track.preprocessor=1
 	fold=1
diff --git a/lexilla/test/TestDocument.cxx b/lexilla/test/TestDocument.cxx
index ff4dafad2..359ff62d0 100644
--- a/lexilla/test/TestDocument.cxx
+++ b/lexilla/test/TestDocument.cxx
@@ -120,7 +120,9 @@ void TestDocument::Set(std::string_view sv) {
 			lineStarts.push_back(pos + 1);
 		}
 	}
-	lineStarts.push_back(text.length());
+	if (lineStarts.back() != Length()) {
+		lineStarts.push_back(Length());
+	}
 	lineStates.resize(lineStarts.size());
 	lineLevels.resize(lineStarts.size(), 0x400);
 }
@@ -130,6 +132,10 @@ void TestDocument::Set(std::string_view sv) {
 #pragma warning(disable: 26440)
 #endif
 
+Sci_Position TestDocument::MaxLine() const noexcept {
+	return lineStarts.size() - 1;
+}
+
 int SCI_METHOD TestDocument::Version() const {
 	return Scintilla::dvRelease4;
 }
@@ -153,8 +159,8 @@ char SCI_METHOD TestDocument::StyleAt(Sci_Position position) const {
 }
 
 Sci_Position SCI_METHOD TestDocument::LineFromPosition(Sci_Position position) const {
-	if (position >= static_cast<Sci_Position>(text.length())) {
-		return lineStarts.size() - 1 - 1;
+	if (position >= Length()) {
+		return MaxLine();
 	}
 
 	const std::vector<Sci_Position>::const_iterator it = std::lower_bound(lineStarts.begin(), lineStarts.end(), position);
@@ -169,7 +175,7 @@ Sci_Position SCI_METHOD TestDocument::LineStart(Sci_Position line) const {
 		return 0;
 	}
 	if (line >= static_cast<Sci_Position>(lineStarts.size())) {
-		return text.length();
+		return Length();
 	}
 	return lineStarts.at(line);
 }
@@ -179,6 +185,9 @@ int SCI_METHOD TestDocument::GetLevel(Sci_Position line) const {
 }
 
 int SCI_METHOD TestDocument::SetLevel(Sci_Position line, int level) {
+	if (line == static_cast<Sci_Position>(lineLevels.size())) {
+		return 0x400;
+	}
 	return lineLevels.at(line) = level;
 }
 
@@ -243,6 +252,11 @@ int SCI_METHOD TestDocument::GetLineIndentation(Sci_Position) {
 }
 
 Sci_Position SCI_METHOD TestDocument::LineEnd(Sci_Position line) const {
+	const Sci_Position maxLine = MaxLine();
+	if (line == maxLine || line == maxLine+1) {
+		return text.length();
+	}
+	assert(line < maxLine);
 	Sci_Position position = LineStart(line + 1);
 	position--; // Back over CR or LF
 	// When line terminator is CR+LF, may need to go back one more
@@ -288,7 +302,7 @@ Sci_Position SCI_METHOD TestDocument::GetRelativePosition(Sci_Position positionS
 
 int SCI_METHOD TestDocument::GetCharacterAndWidth(Sci_Position position, Sci_Position *pWidth) const {
 	// TODO: invalid UTF-8
-	if (position >= static_cast<Sci_Position>(text.length())) {
+	if (position >= Length()) {
 		// Return NULs after document end
 		if (pWidth) {
 			*pWidth = 1;
diff --git a/lexilla/test/TestDocument.h b/lexilla/test/TestDocument.h
index 5213fd0c1..500403100 100644
--- a/lexilla/test/TestDocument.h
+++ b/lexilla/test/TestDocument.h
@@ -27,6 +27,8 @@ public:
 	TestDocument &operator=(TestDocument&&) = delete;
 	virtual ~TestDocument() = default;
 
+	Sci_Position MaxLine() const noexcept;
+
 	int SCI_METHOD Version() const override;
 	void SCI_METHOD SetErrorStatus(int status) override;
 	Sci_Position SCI_METHOD Length() const override;
diff --git a/lexilla/test/TestLexers.cxx b/lexilla/test/TestLexers.cxx
index b7e2c1b34..5bee845bc 100644
--- a/lexilla/test/TestLexers.cxx
+++ b/lexilla/test/TestLexers.cxx
@@ -270,7 +270,9 @@ std::string MarkedDocument(const Scintilla::IDocument *pdoc) {
 	for (Sci_Position pos = 0; pos < pdoc->Length(); pos++) {
 		const char styleNow = pdoc->StyleAt(pos);
 		if (styleNow != prevStyle) {
-			os << "{" << static_cast<unsigned int>(styleNow) << "}";
+			const unsigned char uStyleNow = styleNow;
+			const unsigned int uiStyleNow = uStyleNow;
+			os << "{" << uiStyleNow << "}";
 			prevStyle = styleNow;
 		}
 		char ch = '\0';
@@ -750,10 +752,35 @@ void TestILexer(Scintilla::ILexer5 *plex) {
 	}
 }
 
-bool SetProperties(Scintilla::ILexer5 *plex, const PropertyMap &propertyMap, std::filesystem::path path) {
+bool SetProperties(Scintilla::ILexer5 *plex, const std::string &language, const PropertyMap &propertyMap, std::filesystem::path path) {
 	assert(plex);
 
 	const std::string fileName = path.filename().string();
+
+	if (std::string_view bases = plex->GetSubStyleBases(); !bases.empty()) {
+		// Allocate a substyle for each possible style
+		while (!bases.empty()) {
+			const int baseStyle = bases.front();
+			//	substyles.cpp.11=2
+			const std::string base = std::to_string(baseStyle);
+			const std::string substylesForBase = "substyles." + language + "." + base;
+			std::optional<std::string> substylesN = propertyMap.GetProperty(substylesForBase);
+			if (substylesN) {
+				const int substyles = atoi(substylesN->c_str());
+				const int baseStyleNum = plex->AllocateSubStyles(baseStyle, substyles);
+				//	substylewords.11.1.$(file.patterns.cpp)=std map string vector
+				for (int kw = 0; kw < substyles; kw++) {
+					const std::string substyleWords = "substylewords." + base + "." + std::to_string(kw + 1) + ".*";
+					const std::optional<std::string> keywordN = propertyMap.GetPropertyForFile(substyleWords, fileName);
+					if (keywordN) {
+						plex->SetIdentifiers(baseStyleNum + kw, keywordN->c_str());
+					}
+				}
+			}
+			bases.remove_prefix(1);
+		}
+	}
+
 	// Set keywords, keywords2, ... keywords9, for this file
 	for (int kw = 0; kw < 10; kw++) {
 		std::string kwChoice("keywords");
@@ -790,6 +817,8 @@ bool SetProperties(Scintilla::ILexer5 *plex, const PropertyMap &propertyMap, std
 			// Ignore as processed earlier
 		} else if (key.starts_with("keywords")) {
 			// Ignore as processed earlier
+		} else if (key.starts_with("substyle")) {
+			// Ignore as processed earlier
 		} else {
 			plex->PropertySet(key.c_str(), val.c_str());
 		}
@@ -812,12 +841,12 @@ bool TestFile(const std::filesystem::path &path, const PropertyMap &propertyMap)
 		return false;
 	}
 
-	if (!SetProperties(plex, propertyMap, path)) {
+	TestILexer(plex);
+
+	if (!SetProperties(plex, *language, propertyMap, path)) {
 		return false;
 	}
 
-	TestILexer(plex);
-
 	std::string text = ReadFile(path);
 	if (text.starts_with(BOM)) {
 		text.erase(0, BOM.length());
@@ -880,7 +909,7 @@ bool TestFile(const std::filesystem::path &path, const PropertyMap &propertyMap)
 
 	if (success) {
 		Scintilla::ILexer5 *plexCRLF = Lexilla::MakeLexer(*language);
-		SetProperties(plexCRLF, propertyMap, path.filename().string());
+		SetProperties(plexCRLF, *language, propertyMap, path.filename().string());
 		success = TestCRLF(path, text, plexCRLF, disablePerLineTests);
 	}
 
diff --git a/lexilla/test/examples/cpp/149KeywordCase.cxx b/lexilla/test/examples/cpp/149KeywordCase.cxx
new file mode 100644
index 000000000..402b11178
--- /dev/null
+++ b/lexilla/test/examples/cpp/149KeywordCase.cxx
@@ -0,0 +1,11 @@
+// SCE_C_WORD2 (16)
+second
+
+// SCE_C_IDENTIFIER (11)
+Second
+
+// SCE_C_IDENTIFIER (11)
+upper
+
+// SCE_C_WORD2 (16)
+Upper
diff --git a/lexilla/test/examples/cpp/149KeywordCase.cxx.folded b/lexilla/test/examples/cpp/149KeywordCase.cxx.folded
new file mode 100644
index 000000000..d0cd42bbc
--- /dev/null
+++ b/lexilla/test/examples/cpp/149KeywordCase.cxx.folded
@@ -0,0 +1,12 @@
+ 0 400 400   // SCE_C_WORD2 (16)
+ 0 400 400   second
+ 1 400 400   
+ 0 400 400   // SCE_C_IDENTIFIER (11)
+ 0 400 400   Second
+ 1 400 400   
+ 0 400 400   // SCE_C_IDENTIFIER (11)
+ 0 400 400   upper
+ 1 400 400   
+ 0 400 400   // SCE_C_WORD2 (16)
+ 0 400 400   Upper
+ 1 400 400   
\ No newline at end of file
diff --git a/lexilla/test/examples/cpp/149KeywordCase.cxx.styled b/lexilla/test/examples/cpp/149KeywordCase.cxx.styled
new file mode 100644
index 000000000..2b83474f7
--- /dev/null
+++ b/lexilla/test/examples/cpp/149KeywordCase.cxx.styled
@@ -0,0 +1,11 @@
+{2}// SCE_C_WORD2 (16)
+{16}second{0}
+
+{2}// SCE_C_IDENTIFIER (11)
+{11}Second{0}
+
+{2}// SCE_C_IDENTIFIER (11)
+{11}upper{0}
+
+{2}// SCE_C_WORD2 (16)
+{16}Upper{0}
diff --git a/lexilla/test/examples/cpp/AllStyles.cxx b/lexilla/test/examples/cpp/AllStyles.cxx
index 7d5db581a..e79708ee9 100644
--- a/lexilla/test/examples/cpp/AllStyles.cxx
+++ b/lexilla/test/examples/cpp/AllStyles.cxx
@@ -84,6 +84,15 @@ R"( )"
 // escapesequence=27
 "\001 \b"
 
+// identifier substyles.11.1=128
+vector
+
+// identifier substyles.11.2=129
+std
+
+// commentdockeyword substyles.17.1=130
+/** @module */
+
 // Secondary styles inside preprocessor excluded section
 
 #if 0
@@ -172,4 +181,13 @@ R"( )"
 // escapesequence=27
 "\001 \b"
 
+// identifier substyles.75.1=192
+vector
+
+// identifier substyles.75.2=193
+std
+
+// commentdockeyword substyles.81.1=194
+/** @module */
+
 #endif
diff --git a/lexilla/test/examples/cpp/AllStyles.cxx.folded b/lexilla/test/examples/cpp/AllStyles.cxx.folded
index ae6ffc49c..9a99d341b 100644
--- a/lexilla/test/examples/cpp/AllStyles.cxx.folded
+++ b/lexilla/test/examples/cpp/AllStyles.cxx.folded
@@ -84,6 +84,15 @@
  0 400 400   // escapesequence=27
  0 400 400   "\001 \b"
  1 400 400   
+ 0 400 400   // identifier substyles.11.1=128
+ 0 400 400   vector
+ 1 400 400   
+ 0 400 400   // identifier substyles.11.2=129
+ 0 400 400   std
+ 1 400 400   
+ 0 400 400   // commentdockeyword substyles.17.1=130
+ 0 400 400   /** @module */
+ 1 400 400   
  0 400 400   // Secondary styles inside preprocessor excluded section
  1 400 400   
  2 400 401 + #if 0
@@ -172,5 +181,14 @@
  0 401 401 | // escapesequence=27
  0 401 401 | "\001 \b"
  1 401 401 | 
+ 0 401 401 | // identifier substyles.75.1=192
+ 0 401 401 | vector
+ 1 401 401 | 
+ 0 401 401 | // identifier substyles.75.2=193
+ 0 401 401 | std
+ 1 401 401 | 
+ 0 401 401 | // commentdockeyword substyles.81.1=194
+ 0 401 401 | /** @module */
+ 1 401 401 | 
  0 401 400 | #endif
  1 400 400   
\ No newline at end of file
diff --git a/lexilla/test/examples/cpp/AllStyles.cxx.styled b/lexilla/test/examples/cpp/AllStyles.cxx.styled
index a8e03d605..53ab3c526 100644
--- a/lexilla/test/examples/cpp/AllStyles.cxx.styled
+++ b/lexilla/test/examples/cpp/AllStyles.cxx.styled
@@ -84,6 +84,15 @@
 {2}// escapesequence=27
 {6}"{27}\001{6} {27}\b{6}"{0}
 
+{2}// identifier substyles.11.1=128
+{128}vector{0}
+
+{2}// identifier substyles.11.2=129
+{129}std{0}
+
+{2}// commentdockeyword substyles.17.1=130
+{3}/** {130}@module{3} */{0}
+
 {2}// Secondary styles inside preprocessor excluded section
 {0}
 {9}#if 0
@@ -172,4 +181,13 @@
 {66}// escapesequence=27
 {70}"{91}\001{70} {91}\b{70}"{64}
 
+{66}// identifier substyles.75.1=192
+{192}vector{64}
+
+{66}// identifier substyles.75.2=193
+{193}std{64}
+
+{66}// commentdockeyword substyles.81.1=194
+{67}/** {194}@module{67} */{64}
+
 {9}#endif
diff --git a/lexilla/test/examples/cpp/SciTE.properties b/lexilla/test/examples/cpp/SciTE.properties
index 9e2fbffd6..8429e1eed 100644
--- a/lexilla/test/examples/cpp/SciTE.properties
+++ b/lexilla/test/examples/cpp/SciTE.properties
@@ -1,12 +1,19 @@
 # coding: utf-8
 lexer.*.cxx=cpp
 keywords.*.cxx=int let uuid
-keywords2.*.cxx=second
+keywords2.*.cxx=second Upper
 keywords3.*.cxx=file
 keywords4.*.cxx=global
 keywords5.*.cxx=
 keywords6.*.cxx=TODO
 
+substyles.cpp.11=2
+substylewords.11.1.*.cxx=map string vector
+substylewords.11.2.*.cxx=std gsl
+
+substyles.cpp.17=1
+substylewords.17.1.*.cxx=module
+
 lexer.cpp.track.preprocessor=1
 lexer.cpp.escape.sequence=1
 # Set options so that AllStyles.cxx can show every style
diff --git a/lexilla/test/examples/diff/AllStyles.diff b/lexilla/test/examples/diff/AllStyles.diff
new file mode 100644
index 000000000..2575f8a7e
--- /dev/null
+++ b/lexilla/test/examples/diff/AllStyles.diff
@@ -0,0 +1,49 @@
+Default=0
+ Default
+
+Comment=1
+Another comment
+
+Command=2 diff
+diff -u a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
+
+Header=3 ---
+--- a/cocoa/ScintillaCocoa.mm	2016-12-30 14:38:22.000000000 -0600
+
+Header=3 +++
++++ b/cocoa/ScintillaCocoa.mm	2017-02-15 08:20:12.000000000 -0600
+
+Position=4 @@
+@@ -388,7 +388,8 @@
+
+ - (void) idleTriggered: (NSNotification*) notification
+ {
+ #pragma unused(notification)
+
+Deleted=5 -
+-  static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
+
+Added=6 +
++  if (mTarget)
++    static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
+ }
+ 
+ @end
+
+Changed=7 !
+! 		GdkColor white = { 0, 0xFFFF, 0xFFFF, 0xFFFF};
+
+PatchAdd=8 ++
+++  styler.ColourTo(i - 1, StateToPrint);
+
+PatchDelete=9 +-
++-  styler.ColourTo(i - 1, StateToPrint);
+
+RemovedPatchAdd=10 -+
+-+  styler.ColourTo(i - 1, StateToPrint);
+
+RemovedPatchDelete=11 --
+--  styler.ColourTo(i - 1, StateToPrint);
+
+diff -u a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
+
diff --git a/lexilla/test/examples/diff/AllStyles.diff.folded b/lexilla/test/examples/diff/AllStyles.diff.folded
new file mode 100644
index 000000000..4d4c50049
--- /dev/null
+++ b/lexilla/test/examples/diff/AllStyles.diff.folded
@@ -0,0 +1,50 @@
+ 0 400   0   Default=0
+ 0 400   0    Default
+ 0 400   0   
+ 0 400   0   Comment=1
+ 0 400   0   Another comment
+ 0 400   0   
+ 0 400   0   Command=2 diff
+ 2 400   0 + diff -u a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
+ 0 401   0 | 
+ 0 401   0 | Header=3 ---
+ 2 401   0 + --- a/cocoa/ScintillaCocoa.mm	2016-12-30 14:38:22.000000000 -0600
+ 0 402   0 | 
+ 0 402   0 | Header=3 +++
+ 2 401   0 + +++ b/cocoa/ScintillaCocoa.mm	2017-02-15 08:20:12.000000000 -0600
+ 0 402   0 | 
+ 0 402   0 | Position=4 @@
+ 2 402   0 + @@ -388,7 +388,8 @@
+ 0 403   0 | 
+ 0 403   0 |  - (void) idleTriggered: (NSNotification*) notification
+ 0 403   0 |  {
+ 0 403   0 |  #pragma unused(notification)
+ 0 403   0 | 
+ 0 403   0 | Deleted=5 -
+ 0 403   0 | -  static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
+ 0 403   0 | 
+ 0 403   0 | Added=6 +
+ 0 403   0 | +  if (mTarget)
+ 0 403   0 | +    static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
+ 0 403   0 |  }
+ 0 403   0 |  
+ 0 403   0 |  @end
+ 0 403   0 | 
+ 0 403   0 | Changed=7 !
+ 0 403   0 | ! 		GdkColor white = { 0, 0xFFFF, 0xFFFF, 0xFFFF};
+ 0 403   0 | 
+ 0 403   0 | PatchAdd=8 ++
+ 0 403   0 | ++  styler.ColourTo(i - 1, StateToPrint);
+ 0 403   0 | 
+ 0 403   0 | PatchDelete=9 +-
+ 0 403   0 | +-  styler.ColourTo(i - 1, StateToPrint);
+ 0 403   0 | 
+ 0 403   0 | RemovedPatchAdd=10 -+
+ 0 403   0 | -+  styler.ColourTo(i - 1, StateToPrint);
+ 0 403   0 | 
+ 0 403   0 | RemovedPatchDelete=11 --
+ 0 403   0 | --  styler.ColourTo(i - 1, StateToPrint);
+ 0 403   0 | 
+ 2 400   0 + diff -u a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
+ 0 401   0 | 
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/diff/AllStyles.diff.styled b/lexilla/test/examples/diff/AllStyles.diff.styled
new file mode 100644
index 000000000..e2c138cbc
--- /dev/null
+++ b/lexilla/test/examples/diff/AllStyles.diff.styled
@@ -0,0 +1,49 @@
+{1}Default=0
+{0} Default
+{1}
+Comment=1
+Another comment
+
+Command=2 diff
+{2}diff -u a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
+{1}
+Header=3 ---
+{3}--- a/cocoa/ScintillaCocoa.mm	2016-12-30 14:38:22.000000000 -0600
+{1}
+Header=3 +++
+{3}+++ b/cocoa/ScintillaCocoa.mm	2017-02-15 08:20:12.000000000 -0600
+{1}
+Position=4 @@
+{4}@@ -388,7 +388,8 @@
+{1}
+{0} - (void) idleTriggered: (NSNotification*) notification
+ {
+ #pragma unused(notification)
+{1}
+Deleted=5 -
+{5}-  static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
+{1}
+Added=6 +
+{6}+  if (mTarget)
++    static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
+{0} }
+ 
+ @end
+{1}
+Changed=7 !
+{7}! 		GdkColor white = { 0, 0xFFFF, 0xFFFF, 0xFFFF};
+{1}
+PatchAdd=8 ++
+{8}++  styler.ColourTo(i - 1, StateToPrint);
+{1}
+PatchDelete=9 +-
+{9}+-  styler.ColourTo(i - 1, StateToPrint);
+{1}
+RemovedPatchAdd=10 -+
+{10}-+  styler.ColourTo(i - 1, StateToPrint);
+{1}
+RemovedPatchDelete=11 --
+{11}--  styler.ColourTo(i - 1, StateToPrint);
+{1}
+{2}diff -u a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
+{1}
diff --git a/lexilla/test/examples/diff/LongLine.diff b/lexilla/test/examples/diff/LongLine.diff
new file mode 100644
index 000000000..ae453ac8d
--- /dev/null
+++ b/lexilla/test/examples/diff/LongLine.diff
@@ -0,0 +1,2 @@
++A 1026-byte line is longer than 1024-byte buffer but doesn't cause problems as diff state determine by short line prefix 3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456
+
diff --git a/lexilla/test/examples/diff/LongLine.diff.folded b/lexilla/test/examples/diff/LongLine.diff.folded
new file mode 100644
index 000000000..7168aabde
--- /dev/null
+++ b/lexilla/test/examples/diff/LongLine.diff.folded
@@ -0,0 +1,3 @@
+ 0 400   0   +A 1026-byte line is longer than 1024-byte buffer but doesn't cause problems as diff state determine by short line prefix 3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456
+ 0 400   0   
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/diff/LongLine.diff.styled b/lexilla/test/examples/diff/LongLine.diff.styled
new file mode 100644
index 000000000..c7bc46de8
--- /dev/null
+++ b/lexilla/test/examples/diff/LongLine.diff.styled
@@ -0,0 +1,2 @@
+{6}+A 1026-byte line is longer than 1024-byte buffer but doesn't cause problems as diff state determine by short line prefix 3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456
+{1}
diff --git a/lexilla/test/examples/diff/SciTE.properties b/lexilla/test/examples/diff/SciTE.properties
new file mode 100644
index 000000000..959d6f9d9
--- /dev/null
+++ b/lexilla/test/examples/diff/SciTE.properties
@@ -0,0 +1,2 @@
+lexer.*.diff=diff
+fold=1
diff --git a/lexilla/test/examples/gdscript/AllStyles.gd b/lexilla/test/examples/gdscript/AllStyles.gd
index 0a484a926..756c2fa2b 100644
--- a/lexilla/test/examples/gdscript/AllStyles.gd
+++ b/lexilla/test/examples/gdscript/AllStyles.gd
@@ -49,3 +49,7 @@ var hilight = 2
 @onready
 var a = 3
 @onready var b = 3
+
+# node-identifier=16
+%node
+$node
diff --git a/lexilla/test/examples/gdscript/AllStyles.gd.folded b/lexilla/test/examples/gdscript/AllStyles.gd.folded
index 0b818f3eb..fca05d5d8 100644
--- a/lexilla/test/examples/gdscript/AllStyles.gd.folded
+++ b/lexilla/test/examples/gdscript/AllStyles.gd.folded
@@ -49,4 +49,8 @@
  0 400   0   @onready
  0 400   0   var a = 3
  0 400   0   @onready var b = 3
+ 1 400   0   
+ 0 400   0   # node-identifier=16
+ 0 400   0   %node
+ 0 400   0   $node
  1 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/gdscript/AllStyles.gd.styled b/lexilla/test/examples/gdscript/AllStyles.gd.styled
index 42f3a48cd..82a293422 100644
--- a/lexilla/test/examples/gdscript/AllStyles.gd.styled
+++ b/lexilla/test/examples/gdscript/AllStyles.gd.styled
@@ -49,3 +49,7 @@
 {15}@onready{0}
 {5}var{0} {11}a{0} {10}={0} {2}3{0}
 {15}@onready{0} {5}var{0} {11}b{0} {10}={0} {2}3{0}
+
+{1}# node-identifier=16{0}
+{16}%node{0}
+{16}$node{0}
diff --git a/lexilla/test/examples/gdscript/NodePath.gd b/lexilla/test/examples/gdscript/NodePath.gd
new file mode 100644
index 000000000..152836f04
--- /dev/null
+++ b/lexilla/test/examples/gdscript/NodePath.gd
@@ -0,0 +1,33 @@
+# nodepath
+
+$Node
+
+%Node
+
+%node/"n o d e"/%'n o d e'
+
+%"No de"
+
+
+$/root/ThisNode/%Node % %test
+
+$MainMenuPanel/%Options % %test
+
+%Options % %test
+
+$Node % %test
+
+
+get_node("%Options") % %test
+
+$"Nod   se" % %test
+
+$/test/"No % de"/test % %test
+
+%node/"n o d e"/'n o d e' % %"No De"
+
+"%010d" % 12345
+
+1 % 1
+
+a % b
diff --git a/lexilla/test/examples/gdscript/NodePath.gd.folded b/lexilla/test/examples/gdscript/NodePath.gd.folded
new file mode 100644
index 000000000..3cbe18752
--- /dev/null
+++ b/lexilla/test/examples/gdscript/NodePath.gd.folded
@@ -0,0 +1,34 @@
+ 0 400   0   # nodepath
+ 1 400   0   
+ 0 400   0   $Node
+ 1 400   0   
+ 0 400   0   %Node
+ 1 400   0   
+ 0 400   0   %node/"n o d e"/%'n o d e'
+ 1 400   0   
+ 0 400   0   %"No de"
+ 1 400   0   
+ 1 400   0   
+ 0 400   0   $/root/ThisNode/%Node % %test
+ 1 400   0   
+ 0 400   0   $MainMenuPanel/%Options % %test
+ 1 400   0   
+ 0 400   0   %Options % %test
+ 1 400   0   
+ 0 400   0   $Node % %test
+ 1 400   0   
+ 1 400   0   
+ 0 400   0   get_node("%Options") % %test
+ 1 400   0   
+ 0 400   0   $"Nod   se" % %test
+ 1 400   0   
+ 0 400   0   $/test/"No % de"/test % %test
+ 1 400   0   
+ 0 400   0   %node/"n o d e"/'n o d e' % %"No De"
+ 1 400   0   
+ 0 400   0   "%010d" % 12345
+ 1 400   0   
+ 0 400   0   1 % 1
+ 1 400   0   
+ 0 400   0   a % b
+ 1 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/gdscript/NodePath.gd.styled b/lexilla/test/examples/gdscript/NodePath.gd.styled
new file mode 100644
index 000000000..a00281760
--- /dev/null
+++ b/lexilla/test/examples/gdscript/NodePath.gd.styled
@@ -0,0 +1,33 @@
+{1}# nodepath{0}
+
+{16}$Node{0}
+
+{16}%Node{0}
+
+{16}%node/"n o d e"/%'n o d e'{0}
+
+{16}%"No de"{0}
+
+
+{16}$/root/ThisNode/%Node{0} {10}%{0} {16}%test{0}
+
+{16}$MainMenuPanel/%Options{0} {10}%{0} {16}%test{0}
+
+{16}%Options{0} {10}%{0} {16}%test{0}
+
+{16}$Node{0} {10}%{0} {16}%test{0}
+
+
+{11}get_node{10}({3}"%Options"{10}){0} {10}%{0} {16}%test{0}
+
+{16}$"Nod   se"{0} {10}%{0} {16}%test{0}
+
+{16}$/test/"No % de"/test{0} {10}%{0} {16}%test{0}
+
+{16}%node/"n o d e"/'n o d e'{0} {10}%{0} {16}%"No De"{0}
+
+{3}"%010d"{0} {10}%{0} {2}12345{0}
+
+{2}1{0} {10}%{0} {2}1{0}
+
+{11}a{0} {10}%{0} {11}b{0}
diff --git a/lexilla/test/examples/makefile/longline.mak b/lexilla/test/examples/makefile/longline.mak
new file mode 100644
index 000000000..aeb06fba4
--- /dev/null
+++ b/lexilla/test/examples/makefile/longline.mak
@@ -0,0 +1,4 @@
+# makefile lexer previously used fixed 1024-byte line buffer that would treat text after that as new line
+
+# Long line with 1025 bytes last 2 bytes colored as default 3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345678912345678
+
diff --git a/lexilla/test/examples/makefile/longline.mak.folded b/lexilla/test/examples/makefile/longline.mak.folded
new file mode 100644
index 000000000..f838dc2e7
--- /dev/null
+++ b/lexilla/test/examples/makefile/longline.mak.folded
@@ -0,0 +1,5 @@
+ 0 400   0   # makefile lexer previously used fixed 1024-byte line buffer that would treat text after that as new line
+ 0 400   0   
+ 0 400   0   # Long line with 1025 bytes last 2 bytes colored as default 3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345678912345678
+ 0 400   0   
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/makefile/longline.mak.styled b/lexilla/test/examples/makefile/longline.mak.styled
new file mode 100644
index 000000000..8e7552656
--- /dev/null
+++ b/lexilla/test/examples/makefile/longline.mak.styled
@@ -0,0 +1,4 @@
+{1}# makefile lexer previously used fixed 1024-byte line buffer that would treat text after that as new line
+{0}
+{1}# Long line with 1025 bytes last 2 bytes colored as default 3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345678912345678
+{0}
diff --git a/lexilla/test/examples/ruby/AllStyles.rb b/lexilla/test/examples/ruby/AllStyles.rb
index 705018eb7..2828c4941 100644
--- a/lexilla/test/examples/ruby/AllStyles.rb
+++ b/lexilla/test/examples/ruby/AllStyles.rb
@@ -1,5 +1,5 @@
-# Enumerate all styles where possible: 0..31,40..41
-# 22,23,30,31,40,41 are never set and 1 switches rest of file to error state
+# Enumerate all styles where possible: 0..31,40..45
+# 30,31,40,45 are never set and 1 switches rest of file to error state
 
 #0 whitespace
     #
@@ -66,14 +66,20 @@ module Module15 end
 <<DELIMITER20
 DELIMITER20
 
-#21:here doc
-<<D
-21:here doc
+#21:single quoted heredoc
+<<'D'
+21:here doc #{1 + 1}
 D
 
-#22:here qq never set
+#22:double quoted heredoc
+<<"D"
+22:here doc #{1 + 1}
+D
 
-#23:here qw never set
+#23:back tick quoted heredoc
+<<`D`
+23:here doc #{1 + 1}
+D
 
 #24:q quoted string
 %q!24:quotes's!
@@ -87,13 +93,25 @@ D
 #27:regex
 %r(27[a-z]/[A-Z]+)
 
-#28:string array
-%w(28 cgi.rb complex.rb date.rb)
+#28:interpolable string array
+%W(28 cgi.rb complex.rb date.rb #{1} )
 
 #29:demoted keyword do
 while 1 do end
 
-# 30,31,40,41 never set
+# 30,31,40,45 never set
+
+#41:non-interpolable string array
+%w(#{1 + 1})
+
+#42:non-interpolable symbol array
+%i(#{1 + 1})
+
+#43:interpolable symbol array
+%I(#{1 + 1})
+
+#44:symbol
+%s(#{1 + 1})
 
 #19:data section
 __END__
diff --git a/lexilla/test/examples/ruby/AllStyles.rb.folded b/lexilla/test/examples/ruby/AllStyles.rb.folded
index 51212a4cb..16677afe7 100644
--- a/lexilla/test/examples/ruby/AllStyles.rb.folded
+++ b/lexilla/test/examples/ruby/AllStyles.rb.folded
@@ -1,5 +1,5 @@
- 0 400   0   # Enumerate all styles where possible: 0..31,40..41
- 0 400   0   # 22,23,30,31,40,41 are never set and 1 switches rest of file to error state
+ 0 400   0   # Enumerate all styles where possible: 0..31,40..45
+ 0 400   0   # 30,31,40,45 are never set and 1 switches rest of file to error state
  1 400   0   
  0 400   0   #0 whitespace
  0 400   0       #
@@ -66,14 +66,20 @@
  2 400   0 + <<DELIMITER20
  0 401   0 | DELIMITER20
  1 400   0   
- 0 400   0   #21:here doc
- 2 400   0 + <<D
- 0 401   0 | 21:here doc
+ 0 400   0   #21:single quoted heredoc
+ 2 400   0 + <<'D'
+ 0 401   0 | 21:here doc #{1 + 1}
  0 401   0 | D
  1 400   0   
- 0 400   0   #22:here qq never set
+ 0 400   0   #22:double quoted heredoc
+ 2 400   0 + <<"D"
+ 0 401   0 | 22:here doc #{1 + 1}
+ 0 401   0 | D
  1 400   0   
- 0 400   0   #23:here qw never set
+ 0 400   0   #23:back tick quoted heredoc
+ 2 400   0 + <<`D`
+ 0 401   0 | 23:here doc #{1 + 1}
+ 0 401   0 | D
  1 400   0   
  0 400   0   #24:q quoted string
  0 400   0   %q!24:quotes's!
@@ -87,13 +93,25 @@
  0 400   0   #27:regex
  0 400   0   %r(27[a-z]/[A-Z]+)
  1 400   0   
- 0 400   0   #28:string array
- 0 400   0   %w(28 cgi.rb complex.rb date.rb)
+ 0 400   0   #28:interpolable string array
+ 0 400   0   %W(28 cgi.rb complex.rb date.rb #{1} )
  1 400   0   
  0 400   0   #29:demoted keyword do
  0 400   0   while 1 do end
  1 400   0   
- 0 400   0   # 30,31,40,41 never set
+ 0 400   0   # 30,31,40,45 never set
+ 1 400   0   
+ 0 400   0   #41:non-interpolable string array
+ 0 400   0   %w(#{1 + 1})
+ 1 400   0   
+ 0 400   0   #42:non-interpolable symbol array
+ 0 400   0   %i(#{1 + 1})
+ 1 400   0   
+ 0 400   0   #43:interpolable symbol array
+ 0 400   0   %I(#{1 + 1})
+ 1 400   0   
+ 0 400   0   #44:symbol
+ 0 400   0   %s(#{1 + 1})
  1 400   0   
  0 400   0   #19:data section
  0 400   0   __END__
diff --git a/lexilla/test/examples/ruby/AllStyles.rb.styled b/lexilla/test/examples/ruby/AllStyles.rb.styled
index afdcb4506..8e208bd10 100644
--- a/lexilla/test/examples/ruby/AllStyles.rb.styled
+++ b/lexilla/test/examples/ruby/AllStyles.rb.styled
@@ -1,5 +1,5 @@
-{2}# Enumerate all styles where possible: 0..31,40..41{0}
-{2}# 22,23,30,31,40,41 are never set and 1 switches rest of file to error state{0}
+{2}# Enumerate all styles where possible: 0..31,40..45{0}
+{2}# 30,31,40,45 are never set and 1 switches rest of file to error state{0}
 
 {2}#0 whitespace{0}
     {2}#{0}
@@ -63,17 +63,23 @@
 {2}#19:data section at end of file{0}
 
 {2}#20:here delimiter{0}
-{10}<<{20}DELIMITER20{21}
+{10}<<{20}DELIMITER20{22}
 {20}DELIMITER20{0}
 
-{2}#21:here doc{0}
-{10}<<{20}D{21}
-21:here doc
+{2}#21:single quoted heredoc{0}
+{10}<<{20}'D'{21}
+21:here doc #{1 + 1}
 {20}D{0}
 
-{2}#22:here qq never set{0}
+{2}#22:double quoted heredoc{0}
+{10}<<{20}"D"{22}
+22:here doc {10}#{{4}1{0} {10}+{0} {4}1{10}}{22}
+{20}D{0}
 
-{2}#23:here qw never set{0}
+{2}#23:back tick quoted heredoc{0}
+{10}<<{20}`D`{23}
+23:here doc {10}#{{4}1{0} {10}+{0} {4}1{10}}{23}
+{20}D{0}
 
 {2}#24:q quoted string{0}
 {24}%q!24:quotes's!{0}
@@ -87,13 +93,25 @@
 {2}#27:regex{0}
 {27}%r(27[a-z]/[A-Z]+){0}
 
-{2}#28:string array{0}
-{28}%w(28 cgi.rb complex.rb date.rb){0}
+{2}#28:interpolable string array{0}
+{28}%W(28 cgi.rb complex.rb date.rb {10}#{{4}1{10}}{28} ){0}
 
 {2}#29:demoted keyword do{0}
 {5}while{0} {4}1{0} {29}do{0} {5}end{0}
 
-{2}# 30,31,40,41 never set{0}
+{2}# 30,31,40,45 never set{0}
+
+{2}#41:non-interpolable string array{0}
+{41}%w(#{1 + 1}){0}
+
+{2}#42:non-interpolable symbol array{0}
+{42}%i(#{1 + 1}){0}
+
+{2}#43:interpolable symbol array{0}
+{43}%I({10}#{{4}1{0} {10}+{0} {4}1{10}}{43}){0}
+
+{2}#44:symbol{0}
+{44}%s(#{1 + 1}){0}
 
 {2}#19:data section{0}
 {19}__END__
diff --git a/lexilla/test/examples/ruby/Issue132.rb b/lexilla/test/examples/ruby/Issue132.rb
new file mode 100644
index 000000000..ff41a8491
--- /dev/null
+++ b/lexilla/test/examples/ruby/Issue132.rb
@@ -0,0 +1,3 @@
+# Bad folding when single character ')' in SCE_RB_STRING_QW #132
+%W(#{1 + 1})
+
diff --git a/lexilla/test/examples/ruby/Issue132.rb.folded b/lexilla/test/examples/ruby/Issue132.rb.folded
new file mode 100644
index 000000000..ac9841147
--- /dev/null
+++ b/lexilla/test/examples/ruby/Issue132.rb.folded
@@ -0,0 +1,4 @@
+ 0 400   0   # Bad folding when single character ')' in SCE_RB_STRING_QW #132
+ 0 400   0   %W(#{1 + 1})
+ 1 400   0   
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/ruby/Issue132.rb.styled b/lexilla/test/examples/ruby/Issue132.rb.styled
new file mode 100644
index 000000000..75094c765
--- /dev/null
+++ b/lexilla/test/examples/ruby/Issue132.rb.styled
@@ -0,0 +1,3 @@
+{2}# Bad folding when single character ')' in SCE_RB_STRING_QW #132{0}
+{28}%W({10}#{{4}1{0} {10}+{0} {4}1{10}}{28}){0}
+
diff --git a/lexilla/test/examples/ruby/Issue135.rb b/lexilla/test/examples/ruby/Issue135.rb
new file mode 100644
index 000000000..c997b25bb
--- /dev/null
+++ b/lexilla/test/examples/ruby/Issue135.rb
@@ -0,0 +1,9 @@
+a = <<XXX # :nodoc:
+heredoc
+XXX
+
+puts(<<-ONE, <<-TWO)
+content for heredoc one
+ONE
+content for heredoc two
+TWO
diff --git a/lexilla/test/examples/ruby/Issue135.rb.folded b/lexilla/test/examples/ruby/Issue135.rb.folded
new file mode 100644
index 000000000..767c00489
--- /dev/null
+++ b/lexilla/test/examples/ruby/Issue135.rb.folded
@@ -0,0 +1,10 @@
+ 2 400   0 + a = <<XXX # :nodoc:
+ 0 401   0 | heredoc
+ 0 401   0 | XXX
+ 1 400   0   
+ 2 400   0 + puts(<<-ONE, <<-TWO)
+ 0 401   0 | content for heredoc one
+ 0 401   0 | ONE
+ 0 401   0 | content for heredoc two
+ 0 401   0 | TWO
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/ruby/Issue135.rb.styled b/lexilla/test/examples/ruby/Issue135.rb.styled
new file mode 100644
index 000000000..76e2900df
--- /dev/null
+++ b/lexilla/test/examples/ruby/Issue135.rb.styled
@@ -0,0 +1,9 @@
+{11}a{0} {10}={0} {10}<<{20}XXX{0} {2}# :nodoc:{22}
+heredoc
+{20}XXX{0}
+
+{11}puts{10}(<<{20}-ONE{10},{0} {10}<<{20}-TWO{10}){22}
+content for heredoc one
+ONE
+content for heredoc two
+{20}TWO{0}
diff --git a/lexilla/test/examples/ruby/Issue136.rb b/lexilla/test/examples/ruby/Issue136.rb
new file mode 100644
index 000000000..461c68299
--- /dev/null
+++ b/lexilla/test/examples/ruby/Issue136.rb
@@ -0,0 +1,23 @@
+a = {r: /\w+/, h: <<EOF
+heredoc
+EOF
+}
+
+puts a
+
+def b # :nodoc:
+<<EOF
+heredoc
+EOF
+end
+
+def c # :nodoc:
+/\w+/
+end
+
+puts b
+puts c
+
+$stdout . puts <<EOF
+heredoc
+EOF
diff --git a/lexilla/test/examples/ruby/Issue136.rb.folded b/lexilla/test/examples/ruby/Issue136.rb.folded
new file mode 100644
index 000000000..84c819497
--- /dev/null
+++ b/lexilla/test/examples/ruby/Issue136.rb.folded
@@ -0,0 +1,24 @@
+ 2 400   0 + a = {r: /\w+/, h: <<EOF
+ 0 402   0 | heredoc
+ 0 402   0 | EOF
+ 0 401   0 | }
+ 1 400   0   
+ 0 400   0   puts a
+ 1 400   0   
+ 2 400   0 + def b # :nodoc:
+ 2 401   0 + <<EOF
+ 0 402   0 | heredoc
+ 0 402   0 | EOF
+ 0 401   0 | end
+ 1 400   0   
+ 2 400   0 + def c # :nodoc:
+ 0 401   0 | /\w+/
+ 0 401   0 | end
+ 1 400   0   
+ 0 400   0   puts b
+ 0 400   0   puts c
+ 1 400   0   
+ 2 400   0 + $stdout . puts <<EOF
+ 0 401   0 | heredoc
+ 0 401   0 | EOF
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/ruby/Issue136.rb.styled b/lexilla/test/examples/ruby/Issue136.rb.styled
new file mode 100644
index 000000000..7f5f8efc9
--- /dev/null
+++ b/lexilla/test/examples/ruby/Issue136.rb.styled
@@ -0,0 +1,23 @@
+{11}a{0} {10}={0} {10}{{14}r:{0} {12}/\w+/{10},{0} {14}h:{0} {10}<<{20}EOF{22}
+heredoc
+{20}EOF{0}
+{10}}{0}
+
+{11}puts{0} {11}a{0}
+
+{5}def{0} {9}b{0} {2}# :nodoc:{0}
+{10}<<{20}EOF{22}
+heredoc
+{20}EOF{0}
+{5}end{0}
+
+{5}def{0} {9}c{0} {2}# :nodoc:{0}
+{12}/\w+/{0}
+{5}end{0}
+
+{11}puts{0} {11}b{0}
+{11}puts{0} {11}c{0}
+
+{13}$stdout{0} {10}.{0} {11}puts{0} {10}<<{20}EOF{22}
+heredoc
+{20}EOF{0}
diff --git a/lexilla/test/examples/ruby/Issue140.rb b/lexilla/test/examples/ruby/Issue140.rb
new file mode 100644
index 000000000..ddc009192
--- /dev/null
+++ b/lexilla/test/examples/ruby/Issue140.rb
@@ -0,0 +1,11 @@
+"#{1}"#
+"#@a"#
+"#@@a"#
+"#$a"#
+"#$?"#
+"#$-a1"#
+"#$_a1"#
+"#$123"#
+"#$\"#
+"#$""#
+a = /#$//#
diff --git a/lexilla/test/examples/ruby/Issue140.rb.folded b/lexilla/test/examples/ruby/Issue140.rb.folded
new file mode 100644
index 000000000..eb5510d87
--- /dev/null
+++ b/lexilla/test/examples/ruby/Issue140.rb.folded
@@ -0,0 +1,12 @@
+ 0 400   0   "#{1}"#
+ 0 400   0   "#@a"#
+ 0 400   0   "#@@a"#
+ 0 400   0   "#$a"#
+ 0 400   0   "#$?"#
+ 0 400   0   "#$-a1"#
+ 0 400   0   "#$_a1"#
+ 0 400   0   "#$123"#
+ 0 400   0   "#$\"#
+ 0 400   0   "#$""#
+ 0 400   0   a = /#$//#
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/ruby/Issue140.rb.styled b/lexilla/test/examples/ruby/Issue140.rb.styled
new file mode 100644
index 000000000..496586329
--- /dev/null
+++ b/lexilla/test/examples/ruby/Issue140.rb.styled
@@ -0,0 +1,11 @@
+{6}"{10}#{{4}1{10}}{6}"{2}#{0}
+{6}"{10}#{16}@a{6}"{2}#{0}
+{6}"{10}#{17}@@a{6}"{2}#{0}
+{6}"{10}#{13}$a{6}"{2}#{0}
+{6}"{10}#{13}$?{6}"{2}#{0}
+{6}"{10}#{13}$-a{6}1"{2}#{0}
+{6}"{10}#{13}$_a1{6}"{2}#{0}
+{6}"{10}#{13}$123{6}"{2}#{0}
+{6}"{10}#{13}$\{6}"{2}#{0}
+{6}"{10}#{13}$"{6}"{2}#{0}
+{11}a{0} {10}={0} {12}/{10}#{13}$/{12}/{2}#{0}
diff --git a/lexilla/test/examples/ruby/Issue66.rb.styled b/lexilla/test/examples/ruby/Issue66.rb.styled
index eeed744d9..a21bee1e1 100644
--- a/lexilla/test/examples/ruby/Issue66.rb.styled
+++ b/lexilla/test/examples/ruby/Issue66.rb.styled
@@ -1,8 +1,8 @@
 {2}# Test that final \n in indented heredoc (2nd example) is styled as SCE_RB_HERE_Q not SCE_RB_HERE_DELIM{0}
-{10}<<{20}T{21}
+{10}<<{20}T{22}
 X
 {20}T{0}
 
-{10}<<{20}-T{21}
+{10}<<{20}-T{22}
 X
 {20}T{0}
diff --git a/lexilla/test/examples/ruby/Issue67.rb.styled b/lexilla/test/examples/ruby/Issue67.rb.styled
index 420da7ad7..f3c13601b 100644
--- a/lexilla/test/examples/ruby/Issue67.rb.styled
+++ b/lexilla/test/examples/ruby/Issue67.rb.styled
@@ -1,13 +1,13 @@
 {2}# heredoc method call, other argument{0}
-{11}puts{0} {10}<<{20}~EOT{10}.{11}chomp{21}
+{11}puts{0} {10}<<{20}~EOT{10}.{11}chomp{22}
 	squiggly heredoc
 {20}EOT{0}
 
-{11}puts{0} {10}<<{20}ONE{10},{0} {5}__FILE__{10},{0} {5}__LINE__{21}
+{11}puts{0} {10}<<{20}ONE{10},{0} {5}__FILE__{10},{0} {5}__LINE__{22}
 content for heredoc one
 {20}ONE{0}
 
 {2}# heredoc prevStyle == SCE_RB_GLOBAL{0}
-{13}$stdout{10}.{11}puts{0} {10}<<{20}~EOT{10}.{11}chomp{21}
+{13}$stdout{10}.{11}puts{0} {10}<<{20}~EOT{10}.{11}chomp{22}
 	squiggly heredoc
 {20}EOT{0}
diff --git a/lexilla/test/examples/ruby/PercentEquals124.rb b/lexilla/test/examples/ruby/PercentEquals124.rb
new file mode 100644
index 000000000..88aed3a4e
--- /dev/null
+++ b/lexilla/test/examples/ruby/PercentEquals124.rb
@@ -0,0 +1,8 @@
+# Issue 124, disambiguating %= which may be a quote or modulo assignment
+# %-quoting with '=' as the quote
+s = %=3=
+puts s
+x = 7
+# Modulo assignment, equivalent to x = x % 2
+x %=2
+puts x
diff --git a/lexilla/test/examples/ruby/PercentEquals124.rb.folded b/lexilla/test/examples/ruby/PercentEquals124.rb.folded
new file mode 100644
index 000000000..6c1384a0b
--- /dev/null
+++ b/lexilla/test/examples/ruby/PercentEquals124.rb.folded
@@ -0,0 +1,9 @@
+ 0 400   0   # Issue 124, disambiguating %= which may be a quote or modulo assignment
+ 0 400   0   # %-quoting with '=' as the quote
+ 0 400   0   s = %=3=
+ 0 400   0   puts s
+ 0 400   0   x = 7
+ 0 400   0   # Modulo assignment, equivalent to x = x % 2
+ 0 400   0   x %=2
+ 0 400   0   puts x
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/ruby/PercentEquals124.rb.styled b/lexilla/test/examples/ruby/PercentEquals124.rb.styled
new file mode 100644
index 000000000..eadc623c1
--- /dev/null
+++ b/lexilla/test/examples/ruby/PercentEquals124.rb.styled
@@ -0,0 +1,8 @@
+{2}# Issue 124, disambiguating %= which may be a quote or modulo assignment{0}
+{2}# %-quoting with '=' as the quote{0}
+{11}s{0} {10}={0} {25}%=3={0}
+{11}puts{0} {11}s{0}
+{11}x{0} {10}={0} {4}7{0}
+{2}# Modulo assignment, equivalent to x = x % 2{0}
+{11}x{0} {10}%={4}2{0}
+{11}puts{0} {11}x{0}
diff --git a/lexilla/test/examples/yaml/longline.yaml b/lexilla/test/examples/yaml/longline.yaml
new file mode 100644
index 000000000..aeb06fba4
--- /dev/null
+++ b/lexilla/test/examples/yaml/longline.yaml
@@ -0,0 +1,4 @@
+# makefile lexer previously used fixed 1024-byte line buffer that would treat text after that as new line
+
+# Long line with 1025 bytes last 2 bytes colored as default 3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345678912345678
+
diff --git a/lexilla/test/examples/yaml/longline.yaml.folded b/lexilla/test/examples/yaml/longline.yaml.folded
new file mode 100644
index 000000000..7a5aa8c00
--- /dev/null
+++ b/lexilla/test/examples/yaml/longline.yaml.folded
@@ -0,0 +1,5 @@
+ 0 400   0   # makefile lexer previously used fixed 1024-byte line buffer that would treat text after that as new line
+ 1 400   0   
+ 0 400   0   # Long line with 1025 bytes last 2 bytes colored as default 3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345678912345678
+ 1 400   0   
+ 0 400   0   
\ No newline at end of file
diff --git a/lexilla/test/examples/yaml/longline.yaml.styled b/lexilla/test/examples/yaml/longline.yaml.styled
new file mode 100644
index 000000000..8e7552656
--- /dev/null
+++ b/lexilla/test/examples/yaml/longline.yaml.styled
@@ -0,0 +1,4 @@
+{1}# makefile lexer previously used fixed 1024-byte line buffer that would treat text after that as new line
+{0}
+{1}# Long line with 1025 bytes last 2 bytes colored as default 3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12345678912345678
+{0}
diff --git a/lexilla/test/unit/testWordList.cxx b/lexilla/test/unit/testWordList.cxx
index 7d6089d73..bf2942851 100644
--- a/lexilla/test/unit/testWordList.cxx
+++ b/lexilla/test/unit/testWordList.cxx
@@ -1,10 +1,17 @@
 /** @file testWordList.cxx
  ** Unit Tests for Lexilla internal data structures
+ ** Tests WordList, WordClassifier, and SubStyles
  **/
 
 #include <string.h>
 
+#include <string>
+#include <string_view>
+#include <vector>
+#include <map>
+
 #include "WordList.h"
+#include "SubStyles.h"
 
 #include "catch.hpp"
 
@@ -28,6 +35,14 @@ TEST_CASE("WordList") {
 		REQUIRE(!wl.InList("class"));
 	}
 
+	SECTION("StringInList") {
+		wl.Set("else struct");
+		std::string sStruct = "struct";
+		REQUIRE(wl.InList(sStruct));
+		std::string sClass = "class";
+		REQUIRE(!wl.InList(sClass));
+	}
+
 	SECTION("InListUnicode") {
 		// "cheese" in English
 		// "kase" ('k', 'a with diaeresis', 's', 'e') in German
@@ -104,3 +119,93 @@ TEST_CASE("WordList") {
 		REQUIRE(wl.InListAbridged("\xd1\x81\xd1\x8b\xd1\x80", '~'));
 	}
 }
+
+// Test WordClassifier.
+
+TEST_CASE("WordClassifier") {
+
+	constexpr int base = 1;
+	constexpr int key = 10;
+	constexpr int type = 11;
+	constexpr int other = 40;
+
+	WordClassifier wc(1);
+
+	SECTION("Base") {
+		REQUIRE(wc.Base() == base);
+		wc.Allocate(key, 2);
+		REQUIRE(wc.Start() == key);
+		REQUIRE(wc.Last() == type);
+		REQUIRE(wc.Length() == 2);
+		REQUIRE(wc.IncludesStyle(key));
+		REQUIRE(wc.IncludesStyle(type));
+		REQUIRE(!wc.IncludesStyle(other));
+
+		wc.Clear();
+		REQUIRE(wc.Base() == base);
+		REQUIRE(wc.Start() == 0);
+		REQUIRE(wc.Last() == -1);
+		REQUIRE(wc.Length() == 0);
+	}
+
+	SECTION("ValueFor") {
+		wc.Allocate(key, 2);
+		wc.SetIdentifiers(key, "else if then");
+		wc.SetIdentifiers(type, "double float int long");
+		REQUIRE(wc.ValueFor("if") == key);
+		REQUIRE(wc.ValueFor("double") == type);
+		REQUIRE(wc.ValueFor("fish") < 0);
+		wc.RemoveStyle(type);
+		REQUIRE(wc.ValueFor("double") < 0);
+	}
+
+}
+
+// Test SubStyles.
+
+TEST_CASE("SubStyles") {
+
+	constexpr char bases[] = "\002\005";
+	constexpr int base = 2;
+	constexpr int base2 = 5;
+	constexpr int styleFirst = 0x80;
+	constexpr int stylesAvailable = 0x40;
+	constexpr int distanceToSecondary = 0x40;
+
+	SubStyles subStyles(bases, styleFirst, stylesAvailable, distanceToSecondary);
+
+	SECTION("All") {
+		REQUIRE(subStyles.DistanceToSecondaryStyles() == distanceToSecondary);
+		// Before allocation
+		REQUIRE(subStyles.Start(base) == 0);
+
+		const int startSubStyles = subStyles.Allocate(base, 3);
+		REQUIRE(startSubStyles == styleFirst);
+		REQUIRE(subStyles.Start(base) == styleFirst);
+		REQUIRE(subStyles.Length(base) == 3);
+		REQUIRE(subStyles.BaseStyle(128) == 2);
+
+		// Not a substyle so returns argument.
+		REQUIRE(subStyles.BaseStyle(96) == 96);
+
+		REQUIRE(subStyles.FirstAllocated() == styleFirst);
+		REQUIRE(subStyles.LastAllocated() == styleFirst + 3 - 1);
+		subStyles.SetIdentifiers(styleFirst, "int long size_t");
+		const WordClassifier &wc = subStyles.Classifier(base);
+		REQUIRE(wc.ValueFor("int") == styleFirst);
+		REQUIRE(wc.ValueFor("double") < 0);
+
+		// Add second set of substyles which shouldn't affect first
+		const int startSecondSet = subStyles.Allocate(base2, 2);
+		constexpr int expectedStylesSecond = styleFirst + 3;
+		REQUIRE(startSecondSet == expectedStylesSecond);
+		REQUIRE(subStyles.Start(base) == styleFirst);
+		REQUIRE(subStyles.Start(base2) == expectedStylesSecond);
+		REQUIRE(subStyles.LastAllocated() == styleFirst + 5 - 1);
+
+		// Clear and check that earlier call no longer works
+		subStyles.Free();
+		REQUIRE(subStyles.Start(base) == 0);
+	}
+
+}
diff --git a/lexilla/version.txt b/lexilla/version.txt
index 8db1e5f18..a1a25e0f2 100644
--- a/lexilla/version.txt
+++ b/lexilla/version.txt
@@ -1 +1 @@
-522
\ No newline at end of file
+524
\ No newline at end of file
diff --git a/lexilla/zipsrc.bat b/lexilla/zipsrc.bat
index 808e72d11..b9ec00e85 100644
--- a/lexilla/zipsrc.bat
+++ b/lexilla/zipsrc.bat
@@ -1,18 +1,6 @@
 cd ..
 del/q lexilla.zip
-zip lexilla.zip lexilla\*.* lexilla\*\*.* lexilla\*\*\*.* lexilla\*\*\*\*.* lexilla\*\*\*\*\*.* -x *.bak -x *.o -x *.obj -x *.iobj -x *.dll -x *.exe -x *.a -x *.lib -x *.res -x *.exp -x *.sarif -x *.pdb -x *.ipdb -x *.idb -x *.sbr -x *.ilk
-zip lexilla.zip -d lexilla/src/ARM64/*
-zip lexilla.zip -d lexilla/src/x64/*
-zip lexilla.zip -d lexilla/src/Release/*
-zip lexilla.zip -d lexilla/src/Debug/*
-zip lexilla.zip -d lexilla/src/__pycache__/*
-zip lexilla.zip -d lexilla/test/ARM64/*
-zip lexilla.zip -d lexilla/test/x64/*
-zip lexilla.zip -d lexilla/test/Release/*
-zip lexilla.zip -d lexilla/test/Debug/*
-zip lexilla.zip -d lexilla/test/unit/ARM64/*
-zip lexilla.zip -d lexilla/test/unit/x64/*
-zip lexilla.zip -d lexilla/test/unit/Release/*
-zip lexilla.zip -d lexilla/test/unit/Debug/*
-zip lexilla.zip -d lexilla/scripts/__pycache__/*
+zip lexilla.zip lexilla\*.* lexilla\*\*.* lexilla\*\*\*.* lexilla\*\*\*\*.* lexilla\*\*\*\*\*.* ^
+ -x *.bak *.o *.obj *.iobj *.dll *.exe *.a *.lib *.res *.exp *.sarif *.pdb *.ipdb *.idb *.sbr *.ilk *.tgz ^
+ **/__pycache__/* **/Debug/* **/Release/* **/x64/* **/ARM64/* **/cov-int/* **/.vs/* **/.vscode/* @
 cd lexilla
diff --git a/scintilla/call/ScintillaCall.cxx b/scintilla/call/ScintillaCall.cxx
index 27ad8a738..dcffb8a7e 100644
--- a/scintilla/call/ScintillaCall.cxx
+++ b/scintilla/call/ScintillaCall.cxx
@@ -231,7 +231,7 @@ Position ScintillaCall::GetStyledText(void *tr) {
 	return CallPointer(Message::GetStyledText, 0, tr);
 }
 
-Position ScintillaCall::GetStyledTextFull(void *tr) {
+Position ScintillaCall::GetStyledTextFull(TextRangeFull *tr) {
 	return CallPointer(Message::GetStyledTextFull, 0, tr);
 }
 
@@ -1159,7 +1159,7 @@ Position ScintillaCall::FindText(Scintilla::FindOption searchFlags, void *ft) {
 	return CallPointer(Message::FindText, static_cast<uintptr_t>(searchFlags), ft);
 }
 
-Position ScintillaCall::FindTextFull(Scintilla::FindOption searchFlags, void *ft) {
+Position ScintillaCall::FindTextFull(Scintilla::FindOption searchFlags, TextToFindFull *ft) {
 	return CallPointer(Message::FindTextFull, static_cast<uintptr_t>(searchFlags), ft);
 }
 
@@ -1167,7 +1167,7 @@ Position ScintillaCall::FormatRange(bool draw, void *fr) {
 	return CallPointer(Message::FormatRange, draw, fr);
 }
 
-Position ScintillaCall::FormatRangeFull(bool draw, void *fr) {
+Position ScintillaCall::FormatRangeFull(bool draw, RangeToFormatFull *fr) {
 	return CallPointer(Message::FormatRangeFull, draw, fr);
 }
 
@@ -1235,7 +1235,7 @@ Position ScintillaCall::GetTextRange(void *tr) {
 	return CallPointer(Message::GetTextRange, 0, tr);
 }
 
-Position ScintillaCall::GetTextRangeFull(void *tr) {
+Position ScintillaCall::GetTextRangeFull(TextRangeFull *tr) {
 	return CallPointer(Message::GetTextRangeFull, 0, tr);
 }
 
diff --git a/scintilla/cocoa/PlatCocoa.h b/scintilla/cocoa/PlatCocoa.h
index cc08f8862..984a82f46 100644
--- a/scintilla/cocoa/PlatCocoa.h
+++ b/scintilla/cocoa/PlatCocoa.h
@@ -25,7 +25,7 @@
 #include "QuartzTextLayout.h"
 
 NSRect PRectangleToNSRect(const Scintilla::Internal::PRectangle &rc);
-Scintilla::Internal::PRectangle NSRectToPRectangle(NSRect &rc);
+Scintilla::Internal::PRectangle NSRectToPRectangle(const NSRect &rc);
 CFStringEncoding EncodingFromCharacterSet(bool unicode, Scintilla::CharacterSet characterSet);
 
 @interface ScintillaContextMenu : NSMenu {
diff --git a/scintilla/cocoa/PlatCocoa.mm b/scintilla/cocoa/PlatCocoa.mm
index 47d92750e..66b30ed3e 100644
--- a/scintilla/cocoa/PlatCocoa.mm
+++ b/scintilla/cocoa/PlatCocoa.mm
@@ -73,10 +73,8 @@ NSRect PRectangleToNSRect(const PRectangle &rc) {
 /**
  * Converts an NSRect as used by the system to a native Scintilla rectangle.
  */
-PRectangle NSRectToPRectangle(NSRect &rc) {
-	return PRectangle(static_cast<XYPOSITION>(rc.origin.x), static_cast<XYPOSITION>(rc.origin.y),
-			  static_cast<XYPOSITION>(NSMaxX(rc)),
-			  static_cast<XYPOSITION>(NSMaxY(rc)));
+PRectangle NSRectToPRectangle(const NSRect &rc) {
+	return PRectangle(rc.origin.x, rc.origin.y, NSMaxX(rc), NSMaxY(rc));
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1288,7 +1286,7 @@ void SurfaceImpl::MeasureWidths(const Font *font_, std::string_view text, XYPOSI
 		// Switched to MacRoman to make work so treat as single byte encoding.
 		for (int i=0; i<text.length(); i++) {
 			CGFloat xPosition = CTLineGetOffsetForStringIndex(mLine, i+1, nullptr);
-			positions[i] = static_cast<XYPOSITION>(xPosition);
+			positions[i] = xPosition;
 		}
 		return;
 	}
@@ -1306,7 +1304,7 @@ void SurfaceImpl::MeasureWidths(const Font *font_, std::string_view text, XYPOSI
 			const int codeUnits = UTF16LengthFromUTF8ByteCount(byteCount);
 			const CGFloat xPosition = linePositions[ui];
 			for (unsigned int bytePos=0; (bytePos<byteCount) && (i<text.length()); bytePos++) {
-				positions[i++] = static_cast<XYPOSITION>(xPosition);
+				positions[i++] = xPosition;
 			}
 			ui += codeUnits;
 		}
@@ -1322,14 +1320,14 @@ void SurfaceImpl::MeasureWidths(const Font *font_, std::string_view text, XYPOSI
 			size_t lenChar = DBCSIsLeadByte(mode.codePage, text[i]) ? 2 : 1;
 			CGFloat xPosition = CTLineGetOffsetForStringIndex(mLine, ui+1, NULL);
 			for (unsigned int bytePos=0; (bytePos<lenChar) && (i<text.length()); bytePos++) {
-				positions[i++] = static_cast<XYPOSITION>(xPosition);
+				positions[i++] = xPosition;
 			}
 			ui++;
 		}
 	} else {	// Single byte encoding
 		for (int i=0; i<text.length(); i++) {
 			CGFloat xPosition = CTLineGetOffsetForStringIndex(mLine, i+1, NULL);
-			positions[i] = static_cast<XYPOSITION>(xPosition);
+			positions[i] = xPosition;
 		}
 	}
 
@@ -1405,7 +1403,7 @@ void SurfaceImpl::MeasureWidthsUTF8(const Font *font_, std::string_view text, XY
 		// Switched to MacRoman to make work so treat as single byte encoding.
 		for (int i=0; i<text.length(); i++) {
 			CGFloat xPosition = CTLineGetOffsetForStringIndex(mLine, i+1, nullptr);
-			positions[i] = static_cast<XYPOSITION>(xPosition);
+			positions[i] = xPosition;
 		}
 		return;
 	}
@@ -1422,7 +1420,7 @@ void SurfaceImpl::MeasureWidthsUTF8(const Font *font_, std::string_view text, XY
 		const int codeUnits = UTF16LengthFromUTF8ByteCount(byteCount);
 		const CGFloat xPosition = linePositions[ui];
 		for (unsigned int bytePos=0; (bytePos<byteCount) && (i<text.length()); bytePos++) {
-			positions[i++] = static_cast<XYPOSITION>(xPosition);
+			positions[i++] = xPosition;
 		}
 		ui += codeUnits;
 	}
@@ -1546,8 +1544,8 @@ PRectangle Window::GetPosition() const {
 		CGFloat screenHeight = ScreenMax();
 		// Invert screen positions to match Scintilla
 		return PRectangle(
-			       static_cast<XYPOSITION>(NSMinX(rect)), static_cast<XYPOSITION>(screenHeight - NSMaxY(rect)),
-			       static_cast<XYPOSITION>(NSMaxX(rect)), static_cast<XYPOSITION>(screenHeight - NSMinY(rect)));
+			       NSMinX(rect), screenHeight - NSMaxY(rect),
+			       NSMaxX(rect), screenHeight - NSMinY(rect));
 	} else {
 		return PRectangle(0, 0, 1, 1);
 	}
@@ -1686,8 +1684,8 @@ PRectangle Window::GetMonitorRect(Point) {
 			CGFloat screenHeight = rect.origin.y + rect.size.height;
 			// Invert screen positions to match Scintilla
 			PRectangle rcWork(
-				static_cast<XYPOSITION>(NSMinX(rect)), static_cast<XYPOSITION>(screenHeight - NSMaxY(rect)),
-				static_cast<XYPOSITION>(NSMaxX(rect)), static_cast<XYPOSITION>(screenHeight - NSMinY(rect)));
+				NSMinX(rect), screenHeight - NSMaxY(rect),
+				NSMaxX(rect), screenHeight - NSMinY(rect));
 			PRectangle rcMonitor(rcWork.left - rcPosition.left,
 					     rcWork.top - rcPosition.top,
 					     rcWork.right - rcPosition.left,
@@ -2082,7 +2080,7 @@ void ListBoxImpl::Append(char *s, int type) {
 	}
 	NSImage *img = images[@(type)];
 	if (img) {
-		XYPOSITION widthIcon = static_cast<XYPOSITION>(img.size.width);
+		XYPOSITION widthIcon = img.size.width;
 		if (widthIcon > maxIconWidth) {
 			[colIcon setHidden: NO];
 			maxIconWidth = widthIcon;
diff --git a/scintilla/cocoa/Scintilla/Info.plist b/scintilla/cocoa/Scintilla/Info.plist
index 5d755c6ab..01a7b6b6e 100644
--- a/scintilla/cocoa/Scintilla/Info.plist
+++ b/scintilla/cocoa/Scintilla/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.3.3</string>
+	<string>5.3.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj b/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
index c637d0251..31be524d7 100644
--- a/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
+++ b/scintilla/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
@@ -573,7 +573,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.3.3;
+				CURRENT_PROJECT_VERSION = 5.3.4;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -635,7 +635,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 5.3.3;
+				CURRENT_PROJECT_VERSION = 5.3.4;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -665,7 +665,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5.3.3;
+				CURRENT_PROJECT_VERSION = 5.3.4;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -699,7 +699,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 5.3.3;
+				CURRENT_PROJECT_VERSION = 5.3.4;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/scintilla/cocoa/ScintillaCocoa.h b/scintilla/cocoa/ScintillaCocoa.h
index af42c498f..6769750b7 100644
--- a/scintilla/cocoa/ScintillaCocoa.h
+++ b/scintilla/cocoa/ScintillaCocoa.h
@@ -83,6 +83,8 @@ extern "C" NSString *ScintillaRecPboardType;
 
 namespace Scintilla::Internal {
 
+CGContextRef CGContextCurrent();
+
 /**
  * Main scintilla class, implemented for macOS (Cocoa).
  */
@@ -101,6 +103,8 @@ private:
 	bool isFirstResponder;
 	bool isActive;
 
+	Point sizeClient;
+
 	bool enteredSetScrollingSize;
 
 	bool GetPasteboardData(NSPasteboard *board, SelectionText *selectedText);
@@ -116,6 +120,7 @@ private:
 
 protected:
 	Point GetVisibleOriginInMain() const override;
+	Point ClientSize() const override;
 	PRectangle GetClientRectangle() const override;
 	PRectangle GetClientDrawingRectangle() override;
 	Point ConvertPoint(NSPoint point);
diff --git a/scintilla/cocoa/ScintillaCocoa.mm b/scintilla/cocoa/ScintillaCocoa.mm
index 8b1564053..a545cc3c5 100644
--- a/scintilla/cocoa/ScintillaCocoa.mm
+++ b/scintilla/cocoa/ScintillaCocoa.mm
@@ -399,6 +399,20 @@ const CGFloat paddingHighlightY = 2;
 
 @end
 
+//----------------- CGContextCurrent ---------------------------------------------------------------
+
+CGContextRef Scintilla::Internal::CGContextCurrent() {
+	if (@available(macOS 10.10, *)) {
+		return [NSGraphicsContext currentContext].CGContext;
+	} else {
+		// Use old deprecated API
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+		return static_cast<CGContextRef>([NSGraphicsContext currentContext].graphicsPort);
+#pragma clang diagnostic pop
+	}
+}
+
 //----------------- ScintillaCocoa -----------------------------------------------------------------
 
 ScintillaCocoa::ScintillaCocoa(ScintillaView *sciView_, SCIContentView *viewContent, SCIMarginView *viewMargin) {
@@ -712,7 +726,16 @@ SCIContentView *ScintillaCocoa::ContentView() {
 Scintilla::Internal::Point ScintillaCocoa::GetVisibleOriginInMain() const {
 	NSScrollView *scrollView = ScrollContainer();
 	NSRect contentRect = scrollView.contentView.bounds;
-	return Point(static_cast<XYPOSITION>(contentRect.origin.x), static_cast<XYPOSITION>(contentRect.origin.y));
+	return Point(contentRect.origin.x, contentRect.origin.y);
+}
+
+//--------------------------------------------------------------------------------------------------
+
+/**
+ * Return the size of the client area which has been cached.
+ */
+Scintilla::Internal::Point ScintillaCocoa::ClientSize() const {
+	return sizeClient;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -724,10 +747,7 @@ Scintilla::Internal::Point ScintillaCocoa::GetVisibleOriginInMain() const {
  */
 PRectangle ScintillaCocoa::GetClientRectangle() const {
 	NSScrollView *scrollView = ScrollContainer();
-	NSSize size = scrollView.contentView.bounds.size;
-	Point origin = GetVisibleOriginInMain();
-	return PRectangle(origin.x, origin.y, static_cast<XYPOSITION>(origin.x+size.width),
-			  static_cast<XYPOSITION>(origin.y + size.height));
+	return NSRectToPRectangle(scrollView.contentView.bounds);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -758,7 +778,7 @@ Scintilla::Internal::Point ScintillaCocoa::ConvertPoint(NSPoint point) {
 	NSView *container = ContentView();
 	NSPoint result = [container convertPoint: point fromView: nil];
 	Scintilla::Internal::Point ptOrigin = GetVisibleOriginInMain();
-	return Point(static_cast<XYPOSITION>(result.x - ptOrigin.x), static_cast<XYPOSITION>(result.y - ptOrigin.y));
+	return Point(result.x - ptOrigin.x, result.y - ptOrigin.y);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1132,7 +1152,7 @@ void ScintillaCocoa::CTPaint(void *gc, NSRect rc) {
 
 - (void) drawRect: (NSRect) needsDisplayInRect {
 	if (sci) {
-		CGContextRef context = (CGContextRef) [NSGraphicsContext currentContext].graphicsPort;
+		CGContextRef context = CGContextCurrent();
 		sci->CTPaint(context, needsDisplayInRect);
 	}
 }
@@ -1154,8 +1174,7 @@ void ScintillaCocoa::CTPaint(void *gc, NSRect rc) {
 
 void ScintillaCocoa::CallTipMouseDown(NSPoint pt) {
 	NSRect rectBounds = ((__bridge NSView *)(ct.wDraw.GetID())).bounds;
-	Point location(static_cast<XYPOSITION>(pt.x),
-		       static_cast<XYPOSITION>(rectBounds.size.height - pt.y));
+	Point location(pt.x, rectBounds.size.height - pt.y);
 	ct.MouseClick(location);
 	CallTipClick();
 }
@@ -1341,7 +1360,7 @@ void ScintillaCocoa::DragScroll() {
 		return;
 
 	if ([type compare: NSPasteboardTypeString] == NSOrderedSame) {
-		[pasteboard setString: (__bridge NSString *)cfsVal forType: NSStringPboardType];
+		[pasteboard setString: (__bridge NSString *)cfsVal forType: NSPasteboardTypeString];
 	} else if ([type compare: ScintillaRecPboardType] == NSOrderedSame) {
 		// This is specific to scintilla, allows us to drag rectangular selections around the document.
 		if (selectedText.rectangular)
@@ -1369,7 +1388,16 @@ void ScintillaCocoa::StartDrag() {
 
 	// Put the data to be dragged on the drag pasteboard.
 	SelectionText selectedText;
-	NSPasteboard *pasteboard = [NSPasteboard pasteboardWithName: NSDragPboard];
+	NSPasteboard *pasteboard = nil;
+	if (@available(macOS 10.13, *)) {
+		pasteboard = [NSPasteboard pasteboardWithName: NSPasteboardNameDrag];
+	} else {
+		// Use old deprecated name
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+		pasteboard = [NSPasteboard pasteboardWithName: NSDragPboard];
+#pragma clang diagnostic pop
+	}
 	CopySelectionRange(&selectedText);
 	SetPasteboardData(pasteboard, selectedText);
 
@@ -1550,12 +1578,20 @@ NSDragOperation ScintillaCocoa::DraggingUpdated(id <NSDraggingInfo> info) {
 	NSPasteboard *pasteboard = [info draggingPasteboard];
 
 	// Return what type of operation we will perform. Prefer move over copy.
-	if ([pasteboard.types containsObject: NSStringPboardType] ||
+	if ([pasteboard.types containsObject: NSPasteboardTypeString] ||
 			[pasteboard.types containsObject: ScintillaRecPboardType])
 		return (sourceDragMask & NSDragOperationMove) ? NSDragOperationMove : NSDragOperationCopy;
 
-	if ([pasteboard.types containsObject: NSFilenamesPboardType])
-		return (sourceDragMask & NSDragOperationGeneric);
+	if (@available(macOS 10.13, *)) {
+		if ([pasteboard.types containsObject: NSPasteboardTypeFileURL])
+			return (sourceDragMask & NSDragOperationGeneric);
+	} else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+		if ([pasteboard.types containsObject: NSFilenamesPboardType])
+			return (sourceDragMask & NSDragOperationGeneric);
+#pragma clang diagnostic pop
+	}
 	return NSDragOperationNone;
 }
 
@@ -1579,22 +1615,38 @@ void ScintillaCocoa::DraggingExited(id <NSDraggingInfo> info) {
 bool ScintillaCocoa::PerformDragOperation(id <NSDraggingInfo> info) {
 	NSPasteboard *pasteboard = [info draggingPasteboard];
 
-	if ([pasteboard.types containsObject: NSFilenamesPboardType]) {
-		NSArray *files = [pasteboard propertyListForType: NSFilenamesPboardType];
-		for (NSString* uri in files)
-			NotifyURIDropped(uri.UTF8String);
+	if (@available(macOS 10.13, *)) {
+		// NSPasteboardTypeFileURL is available for macOS 10.13+, provides NSURLs
+		if ([pasteboard.types containsObject: NSPasteboardTypeFileURL]) {
+			NSArray *files = [pasteboard readObjectsForClasses:@[NSURL.class] options:nil];
+			for (NSURL *uri in files) {
+				NotifyURIDropped([uri path].UTF8String);
+			}
+			return true;
+		}
 	} else {
-		SelectionText text;
-		GetPasteboardData(pasteboard, &text);
-
-		if (text.Length() > 0) {
-			NSDragOperation operation = [info draggingSourceOperationMask];
-			bool moving = (operation & NSDragOperationMove) != 0;
-
-			DropAt(posDrag, text.Data(), text.Length(), moving, text.rectangular);
-		};
+		// Use deprecated NSFilenamesPboardType, provides NSStrings
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+		if ([pasteboard.types containsObject: NSFilenamesPboardType]) {
+			NSArray *files = [pasteboard propertyListForType: NSFilenamesPboardType];
+			for (NSString *uri in files) {
+				NotifyURIDropped(uri.UTF8String);
+			}
+		}
+#pragma clang diagnostic pop
 	}
 
+	SelectionText text;
+	GetPasteboardData(pasteboard, &text);
+
+	if (text.Length() > 0) {
+		NSDragOperation operation = [info draggingSourceOperationMask];
+		bool moving = (operation & NSDragOperationMove) != 0;
+
+		DropAt(posDrag, text.Data(), text.Length(), moving, text.rectangular);
+	};
+
 	return true;
 }
 
@@ -1612,8 +1664,8 @@ void ScintillaCocoa::SetPasteboardData(NSPasteboard *board, const SelectionText
 		return;
 
 	NSArray *pbTypes = selectedText.rectangular ?
-			   @[NSStringPboardType, ScintillaRecPboardType] :
-			   @[NSStringPboardType];
+			   @[NSPasteboardTypeString, ScintillaRecPboardType] :
+			   @[NSPasteboardTypeString];
 	[board declareTypes: pbTypes owner: nil];
 
 	if (selectedText.rectangular) {
@@ -1621,7 +1673,7 @@ void ScintillaCocoa::SetPasteboardData(NSPasteboard *board, const SelectionText
 		[board setString: (__bridge NSString *)cfsVal forType: ScintillaRecPboardType];
 	}
 
-	[board setString: (__bridge NSString *)cfsVal forType: NSStringPboardType];
+	[board setString: (__bridge NSString *)cfsVal forType: NSPasteboardTypeString];
 
 	if (cfsVal)
 		CFRelease(cfsVal);
@@ -1634,7 +1686,7 @@ void ScintillaCocoa::SetPasteboardData(NSPasteboard *board, const SelectionText
  */
 bool ScintillaCocoa::GetPasteboardData(NSPasteboard *board, SelectionText *selectedText) {
 	NSArray *supportedTypes = @[ScintillaRecPboardType,
-				    NSStringPboardType];
+				    NSPasteboardTypeString];
 	NSString *bestType = [board availableTypeFromArray: supportedTypes];
 	NSString *data = [board stringForType: bestType];
 
@@ -1840,7 +1892,7 @@ bool ScintillaCocoa::SyncPaint(void *gc, PRectangle rc) {
  * Paint the margin into the SCIMarginView space.
  */
 void ScintillaCocoa::PaintMargin(NSRect aRect) {
-	CGContextRef gc = (CGContextRef) [NSGraphicsContext currentContext].graphicsPort;
+	CGContextRef gc = CGContextCurrent();
 
 	PRectangle rc = NSRectToPRectangle(aRect);
 	rcPaint = rc;
@@ -1988,6 +2040,10 @@ bool ScintillaCocoa::SetScrollingSize() {
 
 void ScintillaCocoa::Resize() {
 	SetScrollingSize();
+
+	const PRectangle rcClient = GetClientRectangle();
+	sizeClient = Point(rcClient.Width(), rcClient.Height());
+
 	ChangeSize();
 }
 
@@ -2597,10 +2653,11 @@ void ScintillaCocoa::UpdateBaseElements() {
 
 	bool changed = false;
 	if (@available(macOS 10.14, *)) {
-		NSColor *textBack = [NSColor.textBackgroundColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
-		NSColor *noFocusBack = [NSColor.unemphasizedSelectedTextBackgroundColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
+		NSColorSpace *colorSpace = [NSColorSpace genericRGBColorSpace];
+		NSColor *textBack = [NSColor.textBackgroundColor colorUsingColorSpace: colorSpace];
+		NSColor *noFocusBack = [NSColor.unemphasizedSelectedTextBackgroundColor colorUsingColorSpace: colorSpace];
 		if (vs.selection.layer == Layer::Base) {
-			NSColor *selBack = [NSColor.selectedTextBackgroundColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
+			NSColor *selBack = [NSColor.selectedTextBackgroundColor colorUsingColorSpace: colorSpace];
 			// Additional selection: blend with text background to make weaker version.
 			NSColor *modified = [selBack blendedColorWithFraction:0.5 ofColor:textBack];
 			changed = vs.SetElementBase(Element::SelectionBack, ColourFromNSColor(selBack));
@@ -2610,7 +2667,7 @@ void ScintillaCocoa::UpdateBaseElements() {
 			// Less translucent colour used in dark mode as otherwise less visible
 			const int alpha = textBack.brightnessComponent > 0.5 ? 0x40 : 0x60;
 			// Make a translucent colour that approximates selectedTextBackgroundColor
-			NSColor *accent = [NSColor.controlAccentColor colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
+			NSColor *accent = [NSColor.controlAccentColor colorUsingColorSpace: colorSpace];
 			const ColourRGBA colourAccent = ColourFromNSColor(accent);
 			changed = vs.SetElementBase(Element::SelectionBack, ColourRGBA(colourAccent, alpha));
 			changed = vs.SetElementBase(Element::SelectionAdditionalBack, ColourRGBA(colourAccent, alpha/2)) || changed;
diff --git a/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj b/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj
index 8c88eb626..d54495357 100644
--- a/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj
+++ b/scintilla/cocoa/ScintillaTest/ScintillaTest.xcodeproj/project.pbxproj
@@ -314,6 +314,7 @@
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
+				LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				OTHER_LDFLAGS = "";
@@ -341,6 +342,7 @@
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
+				LD_RUNPATH_SEARCH_PATHS = "$(LD_RUNPATH_SEARCH_PATHS_$(IS_MACCATALYST)) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				OTHER_LDFLAGS = "";
diff --git a/scintilla/cocoa/ScintillaView.mm b/scintilla/cocoa/ScintillaView.mm
index 8a786c28c..00fd78485 100644
--- a/scintilla/cocoa/ScintillaView.mm
+++ b/scintilla/cocoa/ScintillaView.mm
@@ -197,7 +197,6 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) {
 		marginRect.origin.x = x;
 		marginRect.size.width = width;
 		[self addCursorRect: marginRect cursor: cc];
-		[cc setOnMouseEntered: YES];
 		x += width;
 	}
 }
@@ -235,7 +234,15 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) {
 		trackingArea = nil;
 		mMarkedTextRange = NSMakeRange(NSNotFound, 0);
 
-		[self registerForDraggedTypes: @[NSStringPboardType, ScintillaRecPboardType, NSFilenamesPboardType]];
+		if (@available(macOS 10.13, *)) {
+			[self registerForDraggedTypes: @[NSPasteboardTypeString, ScintillaRecPboardType, NSPasteboardTypeFileURL]];
+		} else {
+			// Use old deprecated type
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+			[self registerForDraggedTypes: @[NSPasteboardTypeString, ScintillaRecPboardType, NSFilenamesPboardType]];
+#pragma clang diagnostic pop
+		}
 
 		// Set up accessibility in the text role
 		if ([self respondsToSelector: @selector(setAccessibilityElement:)]) {
@@ -308,7 +315,6 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) {
 	// We only have one cursor rect: our bounds.
 	const NSRect visibleBounds = mOwner.backend->GetBounds();
 	[self addCursorRect: visibleBounds cursor: mCurrentCursor];
-	[mCurrentCursor setOnMouseEntered: YES];
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -365,7 +371,7 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) {
  * Gets called by the runtime when the view needs repainting.
  */
 - (void) drawRect: (NSRect) rect {
-	CGContextRef context = (CGContextRef) [NSGraphicsContext currentContext].graphicsPort;
+	CGContextRef context = CGContextCurrent();
 
 	if (!mOwner.backend->Draw(rect, context)) {
 		dispatch_async(dispatch_get_main_queue(), ^ {
@@ -778,14 +784,14 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) {
 		// Only snap for positions inside the document - allow outside
 		// for overshoot.
 		long lineHeight = mOwner.backend->WndProc(Message::TextHeight, 0, 0);
-		rc.origin.y = std::round(static_cast<XYPOSITION>(rc.origin.y) / lineHeight) * lineHeight;
+		rc.origin.y = std::round(rc.origin.y / lineHeight) * lineHeight;
 	}
 	// Snap to whole points - on retina displays this avoids visual debris
 	// when scrolling horizontally.
 	if ((rc.origin.x > 0) && (NSMaxX(rc) < contentRect.size.width)) {
 		// Only snap for positions inside the document - allow outside
 		// for overshoot.
-		rc.origin.x = std::round(static_cast<XYPOSITION>(rc.origin.x));
+		rc.origin.x = std::round(rc.origin.x);
 	}
 	return rc;
 }
@@ -1828,11 +1834,10 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) {
  * Specialized property setter for colors.
  */
 - (void) setColorProperty: (int) property parameter: (long) parameter value: (NSColor *) value {
-	if (value.colorSpaceName != NSDeviceRGBColorSpace)
-		value = [value colorUsingColorSpaceName: NSDeviceRGBColorSpace];
-	long red = static_cast<long>(value.redComponent * 255);
-	long green = static_cast<long>(value.greenComponent * 255);
-	long blue = static_cast<long>(value.blueComponent * 255);
+	NSColor *deviceColor = [value colorUsingColorSpace: [NSColorSpace deviceRGBColorSpace]];
+	long red = static_cast<long>(deviceColor.redComponent * 255);
+	long green = static_cast<long>(deviceColor.greenComponent * 255);
+	long blue = static_cast<long>(deviceColor.blueComponent * 255);
 
 	long color = (blue << 16) + (green << 8) + red;
 	mBackend->WndProc(static_cast<Message>(property), parameter, color);
diff --git a/scintilla/doc/ScintillaDoc.html b/scintilla/doc/ScintillaDoc.html
index 7eb02c865..eaf5ad8fe 100644
--- a/scintilla/doc/ScintillaDoc.html
+++ b/scintilla/doc/ScintillaDoc.html
@@ -7982,7 +7982,7 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
 
     <p><b id="SCI_SETLAYOUTTHREADS">SCI_SETLAYOUTTHREADS(int threads)</b><br />
      <b id="SCI_GETLAYOUTTHREADS">SCI_GETLAYOUTTHREADS &rarr; int</b><br />
-     The time taken to measure text runs on wide lines can be improved by performing the task
+     The time taken to measure text runs on wide lines or when wrapping can be improved by performing the task
      concurrently on multiple threads when
      <a class="seealso" href="#SCI_SUPPORTSFEATURE">SCI_SUPPORTSFEATURE(SC_SUPPORTS_THREAD_SAFE_MEASURE_WIDTHS)</a>
      is available.
diff --git a/scintilla/doc/ScintillaDownload.html b/scintilla/doc/ScintillaDownload.html
index 126fa7b53..b04f17fa2 100644
--- a/scintilla/doc/ScintillaDownload.html
+++ b/scintilla/doc/ScintillaDownload.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/scintilla533.zip">
+          <font size="4"> <a href="https://www.scintilla.org/scintilla534.zip">
 	Windows</a>&nbsp;&nbsp;
-	<a href="https://www.scintilla.org/scintilla533.tgz">
+	<a href="https://www.scintilla.org/scintilla534.tgz">
           GTK/Linux</a>&nbsp;&nbsp;
 	</font>
         </td>
@@ -42,7 +42,7 @@
       containing very few restrictions.
     </p>
     <h3>
-       Release 5.3.3
+       Release 5.3.4
     </h3>
     <h4>
        Source Code
@@ -50,8 +50,8 @@
        The source code package contains all of the source code for Scintilla but no binary
 	executable code and is available in
        <ul>
-       <li><a href="https://www.scintilla.org/scintilla533.zip">zip format</a> (1.4M) commonly used on Windows</li>
-       <li><a href="https://www.scintilla.org/scintilla533.tgz">tgz format</a> (1.3M) commonly used on Linux and compatible operating systems</li>
+       <li><a href="https://www.scintilla.org/scintilla534.zip">zip format</a> (1.4M) commonly used on Windows</li>
+       <li><a href="https://www.scintilla.org/scintilla534.tgz">tgz format</a> (1.3M) 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/scintilla/doc/ScintillaHistory.html b/scintilla/doc/ScintillaHistory.html
index 026b1823c..aec60799a 100644
--- a/scintilla/doc/ScintillaHistory.html
+++ b/scintilla/doc/ScintillaHistory.html
@@ -579,6 +579,37 @@
     </tr>
     </table>
     <h2>Releases</h2>
+    <h3>
+       <a href="https://www.scintilla.org/scintilla534.zip">Release 5.3.4</a>
+    </h3>
+    <ul>
+	<li>
+	Released 8 March 2023.
+	</li>
+	<li>
+	Add multithreaded wrap to significantly improve performance of wrapping large files.
+	</li>
+	<li>
+	More typesafe bindings of *Full APIs in ScintillaCall.
+	<a href="https://sourceforge.net/p/scintilla/feature-requests/1477/">Feature #1477</a>.
+	</li>
+	<li>
+	Fix overlapping of text with line end wrap marker.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2378/">Bug #2378</a>.
+	</li>
+	<li>
+	Fix clipping of line end wrap symbol for SC_WRAPVISUALFLAGLOC_END_BY_TEXT.
+	</li>
+	<li>
+	Where a multi-byte character contains multiple styles, display each byte as a representation.
+	This makes it easier to see and fix lexers that change styles mid-character, commonly because
+	they use fixed size buffers.
+	</li>
+	<li>
+	Fix a potential crash with autocompletion list fill-ups where a SCN_CHARADDED
+	handler retriggered an autocompletion list, but with no items that match the typed character.
+	</li>
+    </ul>
     <h3>
        <a href="https://www.scintilla.org/scintilla533.zip">Release 5.3.3</a>
     </h3>
diff --git a/scintilla/doc/index.html b/scintilla/doc/index.html
index 7c5f9500b..7fb04c290 100644
--- a/scintilla/doc/index.html
+++ b/scintilla/doc/index.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="20230208" />
+    <meta name="Date.Modified" content="20230308" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
         #versionlist {
@@ -56,8 +56,8 @@
           GTK, and macOS</font>
         </td>
         <td width="40%" align="right">
-          <font color="#FFCC99" size="3"> Release version 5.3.3<br />
-           Site last modified February 8 2023</font>
+          <font color="#FFCC99" size="3"> Release version 5.3.4<br />
+           Site last modified March 8 2023</font>
         </td>
         <td width="20%">
           &nbsp;
@@ -72,12 +72,12 @@
       </tr>
     </table>
     <ul id="versionlist">
+      <li>Version 5.3.4 adds multithreaded wrapping.</li>
       <li>Version 5.3.3 fixes minor bugs in APIs and platform layers.</li>
       <li>Version 5.3.2 adds SCI_REPLACETARGETMINIMAL to modify text without marking unchanged start and end text in change history.</li>
       <li>Version 5.3.1 can represent invisible text with a character to simplify editing and provide summarized views.</li>
       <li>Version 5.3.0 adds change history.</li>
       <li>Version 5.2.4 fixes failures on GTK with multi-threaded layout.</li>
-      <li>Version 5.2.3 adds 64-bit safe APIs and fixes scrollbar on GTK with Xorg.</li>
     </ul>
     <ul id="menu">
       <li id="remote1"><a href="https://www.scintilla.org/SciTEImage.html">Screenshot</a></li>
diff --git a/scintilla/gtk/PlatGTK.cxx b/scintilla/gtk/PlatGTK.cxx
index b8a2cc7e9..44b99d255 100644
--- a/scintilla/gtk/PlatGTK.cxx
+++ b/scintilla/gtk/PlatGTK.cxx
@@ -2180,7 +2180,7 @@ void Platform::DebugPrintf(const char *format, ...) noexcept {
 	char buffer[2000];
 	va_list pArguments;
 	va_start(pArguments, format);
-	vsprintf(buffer, format, pArguments);
+	vsnprintf(buffer, std::size(buffer), format, pArguments);
 	va_end(pArguments);
 	Platform::DebugDisplay(buffer);
 }
diff --git a/scintilla/gtk/ScintillaGTK.cxx b/scintilla/gtk/ScintillaGTK.cxx
index 3bd906139..0aa7ff08f 100644
--- a/scintilla/gtk/ScintillaGTK.cxx
+++ b/scintilla/gtk/ScintillaGTK.cxx
@@ -402,6 +402,7 @@ void ScintillaGTK::MapThis() {
 		wMain.SetCursor(Window::Cursor::arrow);
 		scrollbarv.SetCursor(Window::Cursor::arrow);
 		scrollbarh.SetCursor(Window::Cursor::arrow);
+		SetClientRectangle();
 		ChangeSize();
 		gdk_window_show(PWindow(wMain));
 	} catch (...) {
@@ -1061,8 +1062,12 @@ void ScintillaGTK::FullPaint() {
 	wText.InvalidateAll();
 }
 
+void ScintillaGTK::SetClientRectangle() {
+	rectangleClient = wMain.GetClientPosition();
+}
+
 PRectangle ScintillaGTK::GetClientRectangle() const {
-	PRectangle rc = wMain.GetClientPosition();
+	PRectangle rc = rectangleClient;
 	if (verticalScrollBarVisible)
 		rc.right -= verticalScrollBarWidth;
 	if (horizontalScrollBarVisible && !Wrapping())
@@ -1788,6 +1793,7 @@ void ScintillaGTK::Resize(int width, int height) {
 		gtk_widget_hide(GTK_WIDGET(PWidget(scrollbarv)));
 		verticalScrollBarWidth = 0;
 	}
+	SetClientRectangle();
 	if (IS_WIDGET_MAPPED(PWidget(wMain))) {
 		ChangeSize();
 	} else {
diff --git a/scintilla/gtk/ScintillaGTK.h b/scintilla/gtk/ScintillaGTK.h
index a1ce05969..7c9b165cb 100644
--- a/scintilla/gtk/ScintillaGTK.h
+++ b/scintilla/gtk/ScintillaGTK.h
@@ -33,6 +33,8 @@ class ScintillaGTK : public ScintillaBase {
 	int verticalScrollBarWidth;
 	int horizontalScrollBarHeight;
 
+	PRectangle rectangleClient;
+
 	SelectionText primary;
 	SelectionPosition posPrimary;
 
@@ -128,6 +130,7 @@ private:
 	bool HaveMouseCapture() override;
 	bool PaintContains(PRectangle rc) override;
 	void FullPaint();
+	void SetClientRectangle();
 	PRectangle GetClientRectangle() const override;
 	void ScrollText(Sci::Line linesToMove) override;
 	void SetVerticalScrollPos() override;
diff --git a/scintilla/gtk/deps.mak b/scintilla/gtk/deps.mak
index 61649de33..766bdaa0b 100644
--- a/scintilla/gtk/deps.mak
+++ b/scintilla/gtk/deps.mak
@@ -414,6 +414,7 @@ PositionCache.o: \
 	../src/CaseFolder.h \
 	../src/Document.h \
 	../src/UniConversion.h \
+	../src/DBCS.h \
 	../src/Selection.h \
 	../src/PositionCache.h
 RESearch.o: \
diff --git a/scintilla/gtk/makefile b/scintilla/gtk/makefile
index 524c3c68f..ffac7c643 100644
--- a/scintilla/gtk/makefile
+++ b/scintilla/gtk/makefile
@@ -29,7 +29,6 @@ WARNINGS += -Wno-language-extension-token
 # register may be used in glib
 # This produces a warning since -Wno-register is not valid for C files but it still works
 WARNINGS += -Wno-register
-DEFINES += -D_CRT_SECURE_NO_DEPRECATE
 endif
 # Can choose aspect to sanitize: address and undefined can simply change SANITIZE but for
 # thread also need to create Position Independent Executable -> search online documentation
diff --git a/scintilla/include/ScintillaCall.h b/scintilla/include/ScintillaCall.h
index 9c851d567..8a01f2acb 100644
--- a/scintilla/include/ScintillaCall.h
+++ b/scintilla/include/ScintillaCall.h
@@ -15,6 +15,11 @@ namespace Scintilla {
 
 enum class Message;	// Declare in case ScintillaMessages.h not included
 
+// Declare in case ScintillaStructures.h not included
+struct TextRangeFull;
+struct TextToFindFull;
+struct RangeToFormatFull;
+
 using FunctionDirect = intptr_t(*)(intptr_t ptr, unsigned int iMessage, uintptr_t wParam, intptr_t lParam, int *pStatus);
 
 struct Failure {
@@ -96,7 +101,7 @@ public:
 	void SelectAll();
 	void SetSavePoint();
 	Position GetStyledText(void *tr);
-	Position GetStyledTextFull(void *tr);
+	Position GetStyledTextFull(TextRangeFull *tr);
 	bool CanRedo();
 	Line MarkerLineFromHandle(int markerHandle);
 	void MarkerDeleteHandle(int markerHandle);
@@ -328,9 +333,9 @@ public:
 	void SetPrintColourMode(Scintilla::PrintOption mode);
 	Scintilla::PrintOption PrintColourMode();
 	Position FindText(Scintilla::FindOption searchFlags, void *ft);
-	Position FindTextFull(Scintilla::FindOption searchFlags, void *ft);
+	Position FindTextFull(Scintilla::FindOption searchFlags, TextToFindFull *ft);
 	Position FormatRange(bool draw, void *fr);
-	Position FormatRangeFull(bool draw, void *fr);
+	Position FormatRangeFull(bool draw, RangeToFormatFull *fr);
 	void SetChangeHistory(Scintilla::ChangeHistoryOption changeHistory);
 	Scintilla::ChangeHistoryOption ChangeHistory();
 	Line FirstVisibleLine();
@@ -347,7 +352,7 @@ public:
 	Position GetSelText(char *text);
 	std::string GetSelText();
 	Position GetTextRange(void *tr);
-	Position GetTextRangeFull(void *tr);
+	Position GetTextRangeFull(TextRangeFull *tr);
 	void HideSelection(bool hide);
 	bool SelectionHidden();
 	int PointXFromPosition(Position pos);
diff --git a/scintilla/qt/ScintillaEdit/ScintillaEdit.pro b/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
index 0c685b2d5..dd01466a3 100644
--- a/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/scintilla/qt/ScintillaEdit/ScintillaEdit.pro
@@ -13,7 +13,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 5.3.3
+VERSION = 5.3.4
 
 SOURCES += \
     ScintillaEdit.cpp \
@@ -64,7 +64,7 @@ OTHER_FILES +=
 
 INCLUDEPATH += ../ScintillaEditBase ../../include ../../src
 
-DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1 _CRT_SECURE_NO_DEPRECATE=1
+DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1
 CONFIG(release, debug|release) {
     DEFINES += NDEBUG=1
 }
diff --git a/scintilla/qt/ScintillaEditBase/PlatQt.cpp b/scintilla/qt/ScintillaEditBase/PlatQt.cpp
index 687749e71..98b17b0cf 100644
--- a/scintilla/qt/ScintillaEditBase/PlatQt.cpp
+++ b/scintilla/qt/ScintillaEditBase/PlatQt.cpp
@@ -1332,7 +1332,7 @@ void Platform::DebugPrintf(const char *format, ...) noexcept
 	char buffer[2000];
 	va_list pArguments{};
 	va_start(pArguments, format);
-	vsprintf(buffer, format, pArguments);
+	vsnprintf(buffer, std::size(buffer), format, pArguments);
 	va_end(pArguments);
 	Platform::DebugDisplay(buffer);
 }
@@ -1345,7 +1345,7 @@ bool Platform::ShowAssertionPopUps(bool /*assertionPopUps*/) noexcept
 void Platform::Assert(const char *c, const char *file, int line) noexcept
 {
 	char buffer[2000];
-	sprintf(buffer, "Assertion [%s] failed at %s %d", c, file, line);
+	snprintf(buffer, std::size(buffer), "Assertion [%s] failed at %s %d", c, file, line);
 	if (Platform::ShowAssertionPopUps(false)) {
 		QMessageBox mb("Assertion Failure", buffer, QMessageBox::NoIcon,
 			QMessageBox::Ok, QMessageBox::NoButton, QMessageBox::NoButton);
diff --git a/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro b/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
index 6ad79a626..b8c41700f 100644
--- a/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/scintilla/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -12,7 +12,7 @@ TEMPLATE = lib
 CONFIG += lib_bundle
 CONFIG += c++1z
 
-VERSION = 5.3.3
+VERSION = 5.3.4
 
 SOURCES += \
     PlatQt.cpp \
@@ -92,7 +92,7 @@ OTHER_FILES +=
 
 INCLUDEPATH += ../../include ../../src
 
-DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1 _CRT_SECURE_NO_DEPRECATE=1
+DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1
 CONFIG(release, debug|release) {
     DEFINES += NDEBUG=1
 }
diff --git a/scintilla/scripts/ScintillaAPIFacer.py b/scintilla/scripts/ScintillaAPIFacer.py
index e30f48380..f26389abb 100644
--- a/scintilla/scripts/ScintillaAPIFacer.py
+++ b/scintilla/scripts/ScintillaAPIFacer.py
@@ -19,9 +19,9 @@ typeAliases = {
 	"colour": "Colour",
 	"colouralpha": "ColourAlpha",
 	"findtext": "void *",
-	"findtextfull": "void *",
+	"findtextfull": "TextToFindFull *",
 	"formatrange": "void *",
-	"formatrangefull": "void *",
+	"formatrangefull": "RangeToFormatFull *",
 	"int": "int",
 	"keymod": "int",
 	"line": "Line",
@@ -30,7 +30,7 @@ typeAliases = {
 	"string": "const char *",
 	"stringresult": "char *",
 	"textrange": "void *",
-	"textrangefull": "void *",
+	"textrangefull": "TextRangeFull *",
 }
 
 basicTypes = [
diff --git a/scintilla/src/Document.cxx b/scintilla/src/Document.cxx
index 891b60d3f..f0ce19a84 100644
--- a/scintilla/src/Document.cxx
+++ b/scintilla/src/Document.cxx
@@ -448,6 +448,10 @@ Sci_Position SCI_METHOD Document::LineStart(Sci_Position line) const {
 	return cb.LineStart(line);
 }
 
+Range Document::LineRange(Sci::Line line) const noexcept {
+	return {cb.LineStart(line), cb.LineStart(line + 1)};
+}
+
 bool Document::IsLineStartPosition(Sci::Position position) const {
 	return LineStart(LineFromPosition(position)) == position;
 }
diff --git a/scintilla/src/Document.h b/scintilla/src/Document.h
index bf0be1334..69bba6a92 100644
--- a/scintilla/src/Document.h
+++ b/scintilla/src/Document.h
@@ -50,6 +50,10 @@ public:
 		return start == end;
 	}
 
+	[[nodiscard]] Sci::Position Length() const noexcept {
+		return (start <= end) ? (end - start) : (start - end);
+	}
+
 	Sci::Position First() const noexcept {
 		return (start <= end) ? start : end;
 	}
@@ -450,6 +454,7 @@ public:
 	int MarkerNumberFromLine(Sci::Line line, int which) const noexcept;
 	int MarkerHandleFromLine(Sci::Line line, int which) const noexcept;
 	Sci_Position SCI_METHOD LineStart(Sci_Position line) const override;
+	[[nodiscard]] Range LineRange(Sci::Line line) const noexcept;
 	bool IsLineStartPosition(Sci::Position position) const;
 	Sci_Position SCI_METHOD LineEnd(Sci_Position line) const override;
 	Sci::Position LineEndPosition(Sci::Position position) const;
diff --git a/scintilla/src/EditView.cxx b/scintilla/src/EditView.cxx
index ed4571d27..22e43a83a 100644
--- a/scintilla/src/EditView.cxx
+++ b/scintilla/src/EditView.cxx
@@ -178,13 +178,6 @@ void DrawStyledText(Surface *surface, const ViewStyle &vs, int styleOffset, PRec
 	}
 }
 
-void Hexits(char *hexits, int ch) noexcept {
-	hexits[0] = 'x';
-	hexits[1] = "0123456789ABCDEF"[ch / 0x10];
-	hexits[2] = "0123456789ABCDEF"[ch % 0x10];
-	hexits[3] = 0;
-}
-
 }
 
 EditView::EditView() {
@@ -402,7 +395,7 @@ void LayoutSegments(IPositionCache *pCache,
 * Copy the given @a line and its styles from the document into local arrays.
 * Also determine the x position at which each character starts.
 */
-void EditView::LayoutLine(const EditModel &model, Surface *surface, const ViewStyle &vstyle, LineLayout *ll, int width) {
+void EditView::LayoutLine(const EditModel &model, Surface *surface, const ViewStyle &vstyle, LineLayout *ll, int width, bool callerMultiThreaded) {
 	if (!ll)
 		return;
 	const Sci::Line line = ll->LineNumber();
@@ -498,7 +491,7 @@ void EditView::LayoutLine(const EditModel &model, Surface *surface, const ViewSt
 
 			const size_t threadsForLength = std::max(1, numCharsInLine / bytesPerLayoutThread);
 			size_t threads = std::min<size_t>({ segments.size(), threadsForLength, maxLayoutThreads });
-			if (!surface->SupportsFeature(Supports::ThreadSafeMeasureWidths)) {
+			if (!surface->SupportsFeature(Supports::ThreadSafeMeasureWidths) || callerMultiThreaded) {
 				threads = 1;
 			}
 
@@ -506,6 +499,7 @@ void EditView::LayoutLine(const EditModel &model, Surface *surface, const ViewSt
 
 			const bool textUnicode = CpUtf8 == model.pdoc->dbcsCodePage;
 			const bool multiThreaded = threads > 1;
+			const bool multiThreadedContext = multiThreaded || callerMultiThreaded;
 			IPositionCache *pCache = posCache.get();
 
 			// If only 1 thread needed then use the main thread, else spin up multiple
@@ -515,8 +509,8 @@ void EditView::LayoutLine(const EditModel &model, Surface *surface, const ViewSt
 			for (size_t th = 0; th < threads; th++) {
 				// Find relative positions of everything except for tabs
 				std::future<void> fut = std::async(policy,
-					[pCache, surface, &vstyle, &ll, &segments, &nextIndex, textUnicode, multiThreaded]() {
-					LayoutSegments(pCache, surface, vstyle, ll, segments, nextIndex, textUnicode, multiThreaded);
+					[pCache, surface, &vstyle, &ll, &segments, &nextIndex, textUnicode, multiThreadedContext]() {
+					LayoutSegments(pCache, surface, vstyle, ll, segments, nextIndex, textUnicode, multiThreadedContext);
 				});
 				futures.push_back(std::move(fut));
 			}
@@ -599,7 +593,7 @@ void EditView::LayoutLine(const EditModel &model, Surface *surface, const ViewSt
 			// Check for wrapIndent minimum
 			if ((FlagSet(vstyle.wrap.visualFlags, WrapVisualFlag::Start)) && (ll->wrapIndent < vstyle.aveCharWidth))
 				ll->wrapIndent = vstyle.aveCharWidth; // Indent to show start visual
-			ll->WrapLine(model.pdoc, posLineStart, vstyle.wrap.state);
+			ll->WrapLine(model.pdoc, posLineStart, vstyle.wrap.state, width);
 		}
 		ll->validity = LineLayout::ValidLevel::lines;
 	}
@@ -894,20 +888,6 @@ ColourRGBA TextBackground(const EditModel &model, const ViewStyle &vsDraw, const
 	}
 }
 
-const char *ControlCharacterString(unsigned char ch) noexcept {
-	const char *const reps[] = {
-		"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",
-		"BS", "HT", "LF", "VT", "FF", "CR", "SO", "SI",
-		"DLE", "DC1", "DC2", "DC3", "DC4", "NAK", "SYN", "ETB",
-		"CAN", "EM", "SUB", "ESC", "FS", "GS", "RS", "US"
-	};
-	if (ch < std::size(reps)) {
-		return reps[ch];
-	} else {
-		return "BAD";
-	}
-}
-
 void DrawTextBlob(Surface *surface, const ViewStyle &vsDraw, PRectangle rcSegment,
 	std::string_view text, ColourRGBA textBack, ColourRGBA textFore, bool fillBackground) {
 	if (rcSegment.Empty())
@@ -1121,14 +1101,15 @@ void EditView::DrawEOL(Surface *surface, const EditModel &model, const ViewStyle
 
 	if (drawWrapMarkEnd) {
 		PRectangle rcPlace = rcSegment;
+		const XYPOSITION maxLeft = rcPlace.right - vsDraw.aveCharWidth;
 
 		if (FlagSet(vsDraw.wrap.visualFlagsLocation, WrapVisualLocation::EndByText)) {
-			rcPlace.left = xEol + xStart + virtualSpace;
+			rcPlace.left = std::min(xEol + xStart + virtualSpace, maxLeft);
 			rcPlace.right = rcPlace.left + vsDraw.aveCharWidth;
 		} else {
 			// rcLine is clipped to text area
 			rcPlace.right = rcLine.right;
-			rcPlace.left = rcPlace.right - vsDraw.aveCharWidth;
+			rcPlace.left = maxLeft;
 		}
 		if (!customDrawWrapMarker) {
 			DrawWrapMarker(surface, rcPlace, true, vsDraw.WrapColour());
diff --git a/scintilla/src/EditView.h b/scintilla/src/EditView.h
index 21ef196c3..1e28d25c5 100644
--- a/scintilla/src/EditView.h
+++ b/scintilla/src/EditView.h
@@ -40,7 +40,6 @@ void DrawTextNoClipPhase(Surface *surface, PRectangle rc, const Style &style, XY
 	std::string_view text, DrawPhase phase);
 void DrawStyledText(Surface *surface, const ViewStyle &vs, int styleOffset, PRectangle rcText,
 	const StyledText &st, size_t start, size_t length, DrawPhase phase);
-void Hexits(char *hexits, int ch) noexcept;
 
 typedef void (*DrawTabArrowFn)(Surface *surface, PRectangle rcTab, int ymid,
 	const ViewStyle &vsDraw, Stroke stroke);
@@ -120,7 +119,7 @@ public:
 
 	std::shared_ptr<LineLayout> RetrieveLineLayout(Sci::Line lineNumber, const EditModel &model);
 	void LayoutLine(const EditModel &model, Surface *surface, const ViewStyle &vstyle,
-		LineLayout *ll, int width);
+		LineLayout *ll, int width, bool callerMultiThreaded=false);
 
 	static void UpdateBidiData(const EditModel &model, const ViewStyle &vstyle, LineLayout *ll);
 
diff --git a/scintilla/src/Editor.cxx b/scintilla/src/Editor.cxx
index 2ee42568c..463b14815 100644
--- a/scintilla/src/Editor.cxx
+++ b/scintilla/src/Editor.cxx
@@ -25,6 +25,9 @@
 #include <iterator>
 #include <memory>
 #include <chrono>
+#include <atomic>
+#include <thread>
+#include <future>
 
 #include "ScintillaTypes.h"
 #include "ScintillaMessages.h"
@@ -212,50 +215,7 @@ void Editor::Finalise() {
 }
 
 void Editor::SetRepresentations() {
-	reprs.Clear();
-
-	// C0 control set
-	const char *const reps[] = {
-		"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",
-		"BS", "HT", "LF", "VT", "FF", "CR", "SO", "SI",
-		"DLE", "DC1", "DC2", "DC3", "DC4", "NAK", "SYN", "ETB",
-		"CAN", "EM", "SUB", "ESC", "FS", "GS", "RS", "US"
-	};
-	for (size_t j=0; j < std::size(reps); j++) {
-		const char c[2] = { static_cast<char>(j), 0 };
-		reprs.SetRepresentation(std::string_view(c, 1), reps[j]);
-	}
-	reprs.SetRepresentation("\x7f", "DEL");
-
-	const int dbcsCodePage = pdoc->dbcsCodePage;
-	// C1 control set
-	// As well as Unicode mode, ISO-8859-1 should use these
-	if (CpUtf8 == dbcsCodePage) {
-		const char *const repsC1[] = {
-			"PAD", "HOP", "BPH", "NBH", "IND", "NEL", "SSA", "ESA",
-			"HTS", "HTJ", "VTS", "PLD", "PLU", "RI", "SS2", "SS3",
-			"DCS", "PU1", "PU2", "STS", "CCH", "MW", "SPA", "EPA",
-			"SOS", "SGCI", "SCI", "CSI", "ST", "OSC", "PM", "APC"
-		};
-		for (size_t j=0; j < std::size(repsC1); j++) {
-			const char c1[3] = { '\xc2',  static_cast<char>(0x80+j), 0 };
-			reprs.SetRepresentation(c1, repsC1[j]);
-		}
-		reprs.SetRepresentation("\xe2\x80\xa8", "LS");
-		reprs.SetRepresentation("\xe2\x80\xa9", "PS");
-	}
-
-	// Invalid as single bytes in multi-byte encodings
-	if (dbcsCodePage) {
-		for (int k = 0x80; k < 0x100; k++) {
-			if ((CpUtf8 == dbcsCodePage) || !IsDBCSValidSingleByte(dbcsCodePage, k)) {
-				const char hiByte[2] = { static_cast<char>(k), 0 };
-				char hexits[4];
-				Hexits(hexits, k);
-				reprs.SetRepresentation(hiByte, hexits);
-			}
-		}
-	}
+	reprs.SetDefaultRepresentations(pdoc->dbcsCodePage);
 }
 
 void Editor::DropGraphics() noexcept {
@@ -317,6 +277,11 @@ Sci::Line Editor::TopLineOfMain() const noexcept {
 		return topLine;
 }
 
+Point Editor::ClientSize() const {
+	const PRectangle rcClient = GetClientRectangle();
+	return Point(rcClient.Width(), rcClient.Height());
+}
+
 PRectangle Editor::GetClientRectangle() const {
 	return wMain.GetClientPosition();
 }
@@ -333,8 +298,8 @@ PRectangle Editor::GetTextRectangle() const {
 }
 
 Sci::Line Editor::LinesOnScreen() const {
-	const PRectangle rcClient = GetClientRectangle();
-	const int htClient = static_cast<int>(rcClient.bottom - rcClient.top);
+	const Point sizeClient = ClientSize();
+	const int htClient = static_cast<int>(sizeClient.y);
 	//Platform::DebugPrintf("lines on screen = %d\n", htClient / lineHeight + 1);
 	return htClient / vs.lineHeight;
 }
@@ -1511,6 +1476,130 @@ bool Editor::WrapOneLine(Surface *surface, Sci::Line lineToWrap) {
 	return pcs->SetHeight(lineToWrap, linesWrapped);
 }
 
+namespace {
+
+// Lines less than lengthToMultiThread are laid out in blocks in parallel.
+// Longer lines are multi-threaded inside LayoutLine.
+// This allows faster processing when lines differ greatly in length and thus time to lay out.
+constexpr Sci::Position lengthToMultiThread = 4000;
+
+}
+
+bool Editor::WrapBlock(Surface *surface, Sci::Line lineToWrap, Sci::Line lineToWrapEnd) {
+
+	const size_t linesBeingWrapped = static_cast<size_t>(lineToWrapEnd - lineToWrap);
+
+	std::vector<int> linesAfterWrap(linesBeingWrapped);
+
+	size_t threads = std::min<size_t>({ linesBeingWrapped, view.maxLayoutThreads });
+	if (!surface->SupportsFeature(Supports::ThreadSafeMeasureWidths)) {
+		threads = 1;
+	}
+
+	const bool multiThreaded = threads > 1;
+
+	ElapsedPeriod epWrapping;
+
+	// Wrap all the short lines in multiple threads
+
+	// If only 1 thread needed then use the main thread, else spin up multiple
+	const std::launch policy = multiThreaded ? std::launch::async : std::launch::deferred;
+
+	std::atomic<size_t> nextIndex = 0;
+
+	// Lines that are less likely to be re-examined should not be read from or written to the cache.
+	const SignificantLines significantLines {
+		pdoc->SciLineFromPosition(sel.MainCaret()),
+		topLine,
+		LinesOnScreen() + 1,
+		view.llc.GetLevel(),
+	};
+
+	// Protect the line layout cache from being accessed from multiple threads simultaneously
+	std::mutex mutexRetrieve;
+
+	std::vector<std::future<void>> futures;
+	for (size_t th = 0; th < threads; th++) {
+		std::future<void> fut = std::async(policy,
+			[=, &surface, &nextIndex, &linesAfterWrap, &mutexRetrieve]() {
+			// llTemporary is reused for non-significant lines, avoiding allocation costs.
+			std::shared_ptr<LineLayout> llTemporary = std::make_shared<LineLayout>(-1, 200);
+			while (true) {
+				const size_t i = nextIndex.fetch_add(1, std::memory_order_acq_rel);
+				if (i >= linesBeingWrapped) {
+					break;
+				}
+				const Sci::Line lineNumber = lineToWrap + i;
+				const Range rangeLine = pdoc->LineRange(lineNumber);
+				const Sci::Position lengthLine = rangeLine.Length();
+				if (lengthLine < lengthToMultiThread) {
+					std::shared_ptr<LineLayout> ll;
+					if (significantLines.LineMayCache(lineNumber)) {
+						std::lock_guard<std::mutex> guard(mutexRetrieve);
+						ll = view.RetrieveLineLayout(lineNumber, *this);
+					} else {
+						ll = llTemporary;
+						ll->ReSet(lineNumber, lengthLine);
+					}
+					view.LayoutLine(*this, surface, vs, ll.get(), wrapWidth, multiThreaded);
+					linesAfterWrap[i] = ll->lines;
+				}
+			}
+		});
+		futures.push_back(std::move(fut));
+	}
+	for (const std::future<void> &f : futures) {
+		f.wait();
+	}
+	// End of multiple threads
+
+	// Multiply duration by number of threads to produce (near) equivalence to duration if single threaded
+	const double durationShortLines = epWrapping.Duration(true);
+	const double durationShortLinesThreads = durationShortLines * threads;
+
+	// Wrap all the long lines in the main thread.
+	// LayoutLine may then multi-thread over segments in each line.
+
+	std::shared_ptr<LineLayout> llLarge = std::make_shared<LineLayout>(-1, 200);
+	for (size_t indexLarge = 0; indexLarge < linesBeingWrapped; indexLarge++) {
+		const Sci::Line lineNumber = lineToWrap + indexLarge;
+		const Range rangeLine = pdoc->LineRange(lineNumber);
+		const Sci::Position lengthLine = rangeLine.Length();
+		if (lengthLine >= lengthToMultiThread) {
+			std::shared_ptr<LineLayout> ll;
+			if (significantLines.LineMayCache(lineNumber)) {
+				ll = view.RetrieveLineLayout(lineNumber, *this);
+			} else {
+				ll = llLarge;
+				ll->ReSet(lineNumber, lengthLine);
+			}
+			view.LayoutLine(*this, surface, vs, ll.get(), wrapWidth);
+			linesAfterWrap[indexLarge] = ll->lines;
+		}
+	}
+
+	const double durationLongLines = epWrapping.Duration();
+	const size_t bytesBeingWrapped = pdoc->LineStart(lineToWrap + linesBeingWrapped) - pdoc->LineStart(lineToWrap);
+
+	size_t wrapsDone = 0;
+
+	for (size_t i = 0; i < linesBeingWrapped; i++) {
+		const Sci::Line lineNumber = lineToWrap + i;
+		int linesWrapped = linesAfterWrap[i];
+		if (vs.annotationVisible != AnnotationVisible::Hidden) {
+			linesWrapped += pdoc->AnnotationLines(lineNumber);
+		}
+		if (pcs->SetHeight(lineNumber, linesWrapped)) {
+			wrapsDone++;
+		}
+		wrapPending.Wrapped(lineNumber);
+	}
+
+	durationWrapOneByte.AddSample(bytesBeingWrapped, durationShortLinesThreads + durationLongLines);
+
+	return wrapsDone > 0;
+}
+
 // Perform  wrapping for a subset of the lines needing wrapping.
 // wsAll: wrap all lines which need wrapping in this single call
 // wsVisible: wrap currently visible lines
@@ -1592,16 +1681,7 @@ bool Editor::WrapLines(WrapScope ws) {
 			if (surface) {
 //Platform::DebugPrintf("Wraplines: scope=%0d need=%0d..%0d perform=%0d..%0d\n", ws, wrapPending.start, wrapPending.end, lineToWrap, lineToWrapEnd);
 
-				const size_t bytesBeingWrapped = pdoc->LineStart(lineToWrapEnd) - pdoc->LineStart(lineToWrap);
-				ElapsedPeriod epWrapping;
-				while (lineToWrap < lineToWrapEnd) {
-					if (WrapOneLine(surface, lineToWrap)) {
-						wrapOccurred = true;
-					}
-					wrapPending.Wrapped(lineToWrap);
-					lineToWrap++;
-				}
-				durationWrapOneByte.AddSample(bytesBeingWrapped, epWrapping.Duration());
+				wrapOccurred = WrapBlock(surface, lineToWrap, lineToWrapEnd);
 
 				goodTopLine = pcs->DisplayFromDoc(lineDocTop) + std::min(
 					subLineTop, static_cast<Sci::Line>(pcs->GetHeight(lineDocTop)-1));
diff --git a/scintilla/src/Editor.h b/scintilla/src/Editor.h
index 4c33b6e6b..0445dcd85 100644
--- a/scintilla/src/Editor.h
+++ b/scintilla/src/Editor.h
@@ -308,6 +308,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	Point GetVisibleOriginInMain() const override;
 	PointDocument DocumentPointFromView(Point ptView) const;  // Convert a point from view space to document
 	Sci::Line TopLineOfMain() const noexcept final;   // Return the line at Main's y coordinate 0
+	virtual Point ClientSize() const;
 	virtual PRectangle GetClientRectangle() const;
 	virtual PRectangle GetClientDrawingRectangle();
 	PRectangle GetTextRectangle() const;
@@ -399,6 +400,7 @@ protected:	// ScintillaBase subclass needs access to much of Editor
 	bool Wrapping() const noexcept;
 	void NeedWrapping(Sci::Line docLineStart=0, Sci::Line docLineEnd=WrapPending::lineLarge);
 	bool WrapOneLine(Surface *surface, Sci::Line lineToWrap);
+	bool WrapBlock(Surface *surface, Sci::Line lineToWrap, Sci::Line lineToWrapEnd);
 	enum class WrapScope {wsAll, wsVisible, wsIdle};
 	bool WrapLines(WrapScope ws);
 	void LinesJoin();
diff --git a/scintilla/src/MarginView.cxx b/scintilla/src/MarginView.cxx
index d96c5ec7c..7f63f3047 100644
--- a/scintilla/src/MarginView.cxx
+++ b/scintilla/src/MarginView.cxx
@@ -376,15 +376,15 @@ void MarginView::PaintOneMargin(Surface *surface, PRectangle rc, PRectangle rcOn
 					char number[100] = "";
 					if (FlagSet(model.foldFlags, FoldFlag::LevelNumbers)) {
 						const FoldLevel lev = model.pdoc->GetFoldLevel(lineDoc);
-						sprintf(number, "%c%c %03X %03X",
+						snprintf(number,std::size(number), "%c%c %03X %03X",
 							LevelIsHeader(lev) ? 'H' : '_',
 							LevelIsWhitespace(lev) ? 'W' : '_',
 							LevelNumber(lev),
-							static_cast<int>(lev) >> 16
+							static_cast<unsigned int>(lev) >> 16
 						);
 					} else {
 						const int state = model.pdoc->GetLineState(lineDoc);
-						sprintf(number, "%0X", state);
+						snprintf(number, std::size(number), "%0X", state);
 					}
 					sNumber = number;
 				}
diff --git a/scintilla/src/PositionCache.cxx b/scintilla/src/PositionCache.cxx
index b7d79054a..da2267afe 100644
--- a/scintilla/src/PositionCache.cxx
+++ b/scintilla/src/PositionCache.cxx
@@ -51,6 +51,7 @@
 #include "CaseFolder.h"
 #include "Document.h"
 #include "UniConversion.h"
+#include "DBCS.h"
 #include "Selection.h"
 #include "PositionCache.h"
 
@@ -101,6 +102,13 @@ void LineLayout::Resize(int maxLineLength_) {
 	}
 }
 
+void LineLayout::ReSet(Sci::Line lineNumber_, Sci::Position maxLineLength_) {
+	lineNumber = lineNumber_;
+	Resize(static_cast<int>(maxLineLength_));
+	lines = 0;
+	Invalidate(ValidLevel::invalid);
+}
+
 void LineLayout::EnsureBidiData() {
 	if (!bidiData) {
 		bidiData = std::make_unique<BidiData>();
@@ -113,6 +121,7 @@ void LineLayout::Free() noexcept {
 	styles.reset();
 	positions.reset();
 	lineStarts.reset();
+	lenLineStarts = 0;
 	bidiData.reset();
 }
 
@@ -326,7 +335,7 @@ int LineLayout::EndLineStyle() const noexcept {
 	return styles[numCharsBeforeEOL > 0 ? numCharsBeforeEOL-1 : 0];
 }
 
-void LineLayout::WrapLine(const Document *pdoc, Sci::Position posLineStart, Wrap wrapState) {
+void LineLayout::WrapLine(const Document *pdoc, Sci::Position posLineStart, Wrap wrapState, XYPOSITION wrapWidth) {
 	// Document wants document positions but simpler to work in line positions
 	// so take care of adding and subtracting line start in a lambda.
 	auto CharacterBoundary = [=](Sci::Position i, Sci::Position moveDir) noexcept -> Sci::Position {
@@ -335,7 +344,7 @@ void LineLayout::WrapLine(const Document *pdoc, Sci::Position posLineStart, Wrap
 	lines = 0;
 	// Calculate line start positions based upon width.
 	Sci::Position lastLineStart = 0;
-	XYPOSITION startOffset = widthLine;
+	XYPOSITION startOffset = wrapWidth;
 	Sci::Position p = 0;
 	while (p < numCharsInLine) {
 		while (p < numCharsInLine && positions[p + 1] < startOffset) {
@@ -377,7 +386,7 @@ void LineLayout::WrapLine(const Document *pdoc, Sci::Position posLineStart, Wrap
 			AddLineStart(lastLineStart);
 			startOffset = positions[lastLineStart];
 			// take into account the space for start wrap mark and indent
-			startOffset += widthLine - wrapIndent;
+			startOffset += wrapWidth - wrapIndent;
 			p = lastLineStart + 1;
 		}
 	}
@@ -445,6 +454,21 @@ XYPOSITION ScreenLine::TabPositionAfter(XYPOSITION xPosition) const {
 	return (std::floor((xPosition + TabWidthMinimumPixels()) / TabWidth()) + 1) * TabWidth();
 }
 
+bool SignificantLines::LineMayCache(Sci::Line line) const noexcept {
+	switch (level) {
+	case LineCache::None:
+		return false;
+	case LineCache::Caret:
+		return line == lineCaret;
+	case LineCache::Page:
+		return (abs(line - lineCaret) < linesOnScreen) ||
+			((line >= lineTop) && (line <= (lineTop + linesOnScreen)));
+	case LineCache::Document:
+	default:
+		return true;
+	}
+}
+
 LineLayoutCache::LineLayoutCache() :
 	level(LineCache::None),
 	allInvalidated(false), styleClock(-1) {
@@ -638,6 +662,40 @@ constexpr unsigned int KeyFromString(std::string_view charBytes) noexcept {
 
 constexpr unsigned int representationKeyCrLf = KeyFromString("\r\n");
 
+const char *const repsC0[] = {
+	"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",
+	"BS", "HT", "LF", "VT", "FF", "CR", "SO", "SI",
+	"DLE", "DC1", "DC2", "DC3", "DC4", "NAK", "SYN", "ETB",
+	"CAN", "EM", "SUB", "ESC", "FS", "GS", "RS", "US"
+};
+
+const char *const repsC1[] = {
+	"PAD", "HOP", "BPH", "NBH", "IND", "NEL", "SSA", "ESA",
+	"HTS", "HTJ", "VTS", "PLD", "PLU", "RI", "SS2", "SS3",
+	"DCS", "PU1", "PU2", "STS", "CCH", "MW", "SPA", "EPA",
+	"SOS", "SGCI", "SCI", "CSI", "ST", "OSC", "PM", "APC"
+};
+
+}
+
+namespace Scintilla::Internal {
+
+const char *ControlCharacterString(unsigned char ch) noexcept {
+	if (ch < std::size(repsC0)) {
+		return repsC0[ch];
+	} else {
+		return "BAD";
+	}
+}
+
+
+void Hexits(char *hexits, int ch) noexcept {
+	hexits[0] = 'x';
+	hexits[1] = "0123456789ABCDEF"[ch / 0x10];
+	hexits[2] = "0123456789ABCDEF"[ch % 0x10];
+	hexits[3] = 0;
+}
+
 }
 
 void SpecialRepresentations::SetRepresentation(std::string_view charBytes, std::string_view value) {
@@ -731,6 +789,40 @@ void SpecialRepresentations::Clear() {
 	crlf = false;
 }
 
+void SpecialRepresentations::SetDefaultRepresentations(int dbcsCodePage) {
+	Clear();
+
+	// C0 control set
+	for (size_t j = 0; j < std::size(repsC0); j++) {
+		const char c[2] = { static_cast<char>(j), 0 };
+		SetRepresentation(std::string_view(c, 1), repsC0[j]);
+	}
+	SetRepresentation("\x7f", "DEL");
+
+	// C1 control set
+	// As well as Unicode mode, ISO-8859-1 should use these
+	if (CpUtf8 == dbcsCodePage) {
+		for (size_t j = 0; j < std::size(repsC1); j++) {
+			const char c1[3] = { '\xc2',  static_cast<char>(0x80 + j), 0 };
+			SetRepresentation(c1, repsC1[j]);
+		}
+		SetRepresentation("\xe2\x80\xa8", "LS");
+		SetRepresentation("\xe2\x80\xa9", "PS");
+	}
+
+	// Invalid as single bytes in multi-byte encodings
+	if (dbcsCodePage) {
+		for (int k = 0x80; k < 0x100; k++) {
+			if ((CpUtf8 == dbcsCodePage) || !IsDBCSValidSingleByte(dbcsCodePage, k)) {
+				const char hiByte[2] = { static_cast<char>(k), 0 };
+				char hexits[4];
+				Hexits(hexits, k);
+				SetRepresentation(hiByte, hexits);
+			}
+		}
+	}
+}
+
 void BreakFinder::Insert(Sci::Position val) {
 	const int posInLine = static_cast<int>(val);
 	if (posInLine > nextBreak) {
@@ -819,12 +911,28 @@ TextSegment BreakFinder::Next() {
 			int charWidth = 1;
 			const char * const chars = &ll->chars[nextBreak];
 			const unsigned char ch = chars[0];
+			bool characterStyleConsistent = true;	// All bytes of character in same style?
 			if (!UTF8IsAscii(ch) && encodingFamily != EncodingFamily::eightBit) {
 				if (encodingFamily == EncodingFamily::unicode) {
 					charWidth = UTF8DrawBytes(chars, lineRange.end - nextBreak);
 				} else {
 					charWidth = pdoc->DBCSDrawBytes(std::string_view(chars, lineRange.end - nextBreak));
 				}
+				for (int trail = 1; trail < charWidth; trail++) {
+					if (ll->styles[nextBreak] != ll->styles[nextBreak + trail]) {
+						characterStyleConsistent = false;
+					}
+				}
+			}
+			if (!characterStyleConsistent) {
+				if (nextBreak == prev) {
+					// Show first character representation bytes since it has inconsistent styles.
+					charWidth = 1;
+				} else {
+					// Return segment before nextBreak but allow to be split up if too long
+					// If not split up, next call will hit the above 'charWidth = 1;' and display bytes.
+					break;
+				}
 			}
 			repr = nullptr;
 			if (preprs->MayContain(ch)) {
diff --git a/scintilla/src/PositionCache.h b/scintilla/src/PositionCache.h
index 3bb08fac8..f606506a9 100644
--- a/scintilla/src/PositionCache.h
+++ b/scintilla/src/PositionCache.h
@@ -83,6 +83,7 @@ public:
 	void operator=(LineLayout &&) = delete;
 	virtual ~LineLayout();
 	void Resize(int maxLineLength_);
+	void ReSet(Sci::Line lineNumber_, Sci::Position maxLineLength_);
 	void EnsureBidiData();
 	void Free() noexcept;
 	void ClearPositions();
@@ -107,7 +108,7 @@ public:
 	Interval Span(int start, int end) const noexcept;
 	Interval SpanByte(int index) const noexcept;
 	int EndLineStyle() const noexcept;
-	void WrapLine(const Document *pdoc, Sci::Position posLineStart, Wrap wrapState);
+	void WrapLine(const Document *pdoc, Sci::Position posLineStart, Wrap wrapState, XYPOSITION wrapWidth);
 };
 
 struct ScreenLine : public IScreenLine {
@@ -140,6 +141,14 @@ struct ScreenLine : public IScreenLine {
 	XYPOSITION TabPositionAfter(XYPOSITION xPosition) const override;
 };
 
+struct SignificantLines {
+	Sci::Line lineCaret;
+	Sci::Line lineTop;
+	Sci::Line linesOnScreen;
+	Scintilla::LineCache level;
+	bool LineMayCache(Sci::Line line) const noexcept;
+};
+
 /**
  */
 class LineLayoutCache {
@@ -180,6 +189,9 @@ public:
 
 typedef std::map<unsigned int, Representation> MapRepresentation;
 
+const char *ControlCharacterString(unsigned char ch) noexcept;
+void Hexits(char *hexits, int ch) noexcept;
+
 class SpecialRepresentations {
 	MapRepresentation mapReprs;
 	unsigned short startByteHasReprs[0x100] {};
@@ -199,6 +211,7 @@ public:
 		return startByteHasReprs[ch] != 0;
 	}
 	void Clear();
+	void SetDefaultRepresentations(int dbcsCodePage);
 };
 
 struct TextSegment {
diff --git a/scintilla/src/ScintillaBase.cxx b/scintilla/src/ScintillaBase.cxx
index 2e7b79161..0fda40245 100644
--- a/scintilla/src/ScintillaBase.cxx
+++ b/scintilla/src/ScintillaBase.cxx
@@ -83,7 +83,7 @@ void ScintillaBase::InsertCharacter(std::string_view sv, CharacterSource charSou
 	if (!isFillUp) {
 		Editor::InsertCharacter(sv, charSource);
 	}
-	if (acActive) {
+	if (acActive && ac.Active()) { // if it was and still is active
 		AutoCompleteCharacterAdded(sv[0]);
 		// For fill ups add the character after the autocompletion has
 		// triggered so containers see the key so can display a calltip.
@@ -581,7 +581,6 @@ public:
 	void PropSet(const char *key, const char *val);
 	const char *PropGet(const char *key) const;
 	int PropGetInt(const char *key, int defaultValue=0) const;
-	size_t PropGetExpanded(const char *key, char *result) const;
 
 	LineEndType LineEndTypesSupported() override;
 	int AllocateSubStyles(int styleBase, int numberStyles);
@@ -701,19 +700,6 @@ int LexState::PropGetInt(const char *key, int defaultValue) const {
 	return defaultValue;
 }
 
-size_t LexState::PropGetExpanded(const char *key, char *result) const {
-	if (instance) {
-		const char *value = instance->PropertyGet(key);
-		if (value) {
-			if (result) {
-				strcpy(result, value);
-			}
-			return strlen(value);
-		}
-	}
-	return 0;
-}
-
 LineEndType LexState::LineEndTypesSupported() {
 	if (instance) {
 		return static_cast<LineEndType>(instance->LineEndTypesSupported());
@@ -1055,8 +1041,7 @@ sptr_t ScintillaBase::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) {
 		return StringResult(lParam, DocumentLexState()->PropGet(ConstCharPtrFromUPtr(wParam)));
 
 	case Message::GetPropertyExpanded:
-		return DocumentLexState()->PropGetExpanded(ConstCharPtrFromUPtr(wParam),
-			CharPtrFromSPtr(lParam));
+		return StringResult(lParam, DocumentLexState()->PropGet(ConstCharPtrFromUPtr(wParam)));
 
 	case Message::GetPropertyInt:
 		return DocumentLexState()->PropGetInt(ConstCharPtrFromUPtr(wParam), static_cast<int>(lParam));
diff --git a/scintilla/test/unit/UnitTester.cxx b/scintilla/test/unit/UnitTester.cxx
index e498add10..6382b428b 100644
--- a/scintilla/test/unit/UnitTester.cxx
+++ b/scintilla/test/unit/UnitTester.cxx
@@ -33,7 +33,7 @@ void Platform::DebugPrintf(const char *format, ...) noexcept {
 	char buffer[2000];
 	va_list pArguments;
 	va_start(pArguments, format);
-	vsprintf(buffer, format, pArguments);
+	vsnprintf(buffer, std::size(buffer), format, pArguments);
 	va_end(pArguments);
 	fprintf(stderr, "%s", buffer);
 }
diff --git a/scintilla/test/unit/UnitTester.vcxproj b/scintilla/test/unit/UnitTester.vcxproj
index d5879c27b..77b025d64 100644
--- a/scintilla/test/unit/UnitTester.vcxproj
+++ b/scintilla/test/unit/UnitTester.vcxproj
@@ -89,7 +89,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS=1;_HAS_AUTO_PTR_ETC=1;_SCL_SECURE_NO_WARNINGS=1;CHECK_CORRECTNESS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CHECK_CORRECTNESS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\;..\..\src\;..\..\lexlib\</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -104,7 +104,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS=1;_HAS_AUTO_PTR_ETC=1;_SCL_SECURE_NO_WARNINGS=1;CHECK_CORRECTNESS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CHECK_CORRECTNESS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\;..\..\src\;..\..\lexlib\</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -121,7 +121,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS=1;_HAS_AUTO_PTR_ETC=1;_SCL_SECURE_NO_WARNINGS=1;CHECK_CORRECTNESS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CHECK_CORRECTNESS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\;..\..\src\;..\..\lexlib\</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
@@ -140,7 +140,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS=1;_HAS_AUTO_PTR_ETC=1;_SCL_SECURE_NO_WARNINGS=1;CHECK_CORRECTNESS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CHECK_CORRECTNESS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\include\;..\..\src\;..\..\lexlib\</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
diff --git a/scintilla/test/unit/makefile b/scintilla/test/unit/makefile
index a43a06087..6f3aad419 100644
--- a/scintilla/test/unit/makefile
+++ b/scintilla/test/unit/makefile
@@ -20,7 +20,6 @@ CXXFLAGS += --std=$(CXXSTD)
 
 ifdef CLANG
 CXX = clang++
-CXXFLAGS += -D_CRT_SECURE_NO_DEPRECATE
 ifdef USELIBCPP
 # macOS, use libc++ but don't have sanitizers
 CXXFLAGS += --stdlib=libc++
diff --git a/scintilla/test/unit/unitTest.cxx b/scintilla/test/unit/unitTest.cxx
index a569787ee..00cd01f3b 100644
--- a/scintilla/test/unit/unitTest.cxx
+++ b/scintilla/test/unit/unitTest.cxx
@@ -69,7 +69,7 @@ void Platform::DebugPrintf(const char *format, ...) noexcept {
 	char buffer[2000];
 	va_list pArguments;
 	va_start(pArguments, format);
-	vsprintf(buffer, format, pArguments);
+	vsnprintf(buffer, std::size(buffer), format, pArguments);
 	va_end(pArguments);
 	fprintf(stderr, "%s", buffer);
 }
diff --git a/scintilla/version.txt b/scintilla/version.txt
index 9e42f4fac..54ba45626 100644
--- a/scintilla/version.txt
+++ b/scintilla/version.txt
@@ -1 +1 @@
-533
+534
diff --git a/scintilla/win32/PlatWin.cxx b/scintilla/win32/PlatWin.cxx
index 22ce18003..7a9f41ae4 100644
--- a/scintilla/win32/PlatWin.cxx
+++ b/scintilla/win32/PlatWin.cxx
@@ -3860,7 +3860,7 @@ void Platform::DebugPrintf(const char *format, ...) noexcept {
 	char buffer[2000];
 	va_list pArguments;
 	va_start(pArguments, format);
-	vsprintf(buffer,format,pArguments);
+	vsnprintf(buffer, std::size(buffer), format, pArguments);
 	va_end(pArguments);
 	Platform::DebugDisplay(buffer);
 }
@@ -3879,7 +3879,7 @@ bool Platform::ShowAssertionPopUps(bool assertionPopUps_) noexcept {
 
 void Platform::Assert(const char *c, const char *file, int line) noexcept {
 	char buffer[2000] {};
-	sprintf(buffer, "Assertion [%s] failed at %s %d%s", c, file, line, assertionPopUps ? "" : "\r\n");
+	snprintf(buffer, std::size(buffer), "Assertion [%s] failed at %s %d%s", c, file, line, assertionPopUps ? "" : "\r\n");
 	if (assertionPopUps) {
 		const int idButton = ::MessageBoxA(0, buffer, "Assertion failure",
 			MB_ABORTRETRYIGNORE|MB_ICONHAND|MB_SETFOREGROUND|MB_TASKMODAL);
diff --git a/scintilla/win32/ScintRes.rc b/scintilla/win32/ScintRes.rc
index a9777b4e3..58feaaa83 100644
--- a/scintilla/win32/ScintRes.rc
+++ b/scintilla/win32/ScintRes.rc
@@ -4,8 +4,8 @@
 
 #include <windows.h>
 
-#define VERSION_SCINTILLA "5.3.3"
-#define VERSION_WORDS 5, 3, 3, 0
+#define VERSION_SCINTILLA "5.3.4"
+#define VERSION_WORDS 5, 3, 4, 0
 
 VS_VERSION_INFO VERSIONINFO
 FILEVERSION	VERSION_WORDS
diff --git a/scintilla/win32/Scintilla.vcxproj b/scintilla/win32/Scintilla.vcxproj
index 91837e165..9ab20e453 100644
--- a/scintilla/win32/Scintilla.vcxproj
+++ b/scintilla/win32/Scintilla.vcxproj
@@ -91,7 +91,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>WIN32;SCI_EMPTYCATALOGUE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_WINDOWS;_USRDLL;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;SCI_OWNREGEX;SCI_NAMESPACE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_USRDLL;SCI_OWNREGEX;SCI_NAMESPACE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\include;..\src;..\..\boostregex</AdditionalIncludeDirectories>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/scintilla/win32/deps.mak b/scintilla/win32/deps.mak
index 588edba86..1b9c89011 100644
--- a/scintilla/win32/deps.mak
+++ b/scintilla/win32/deps.mak
@@ -373,6 +373,7 @@ $(DIR_O)/PositionCache.o: \
 	../src/CaseFolder.h \
 	../src/Document.h \
 	../src/UniConversion.h \
+	../src/DBCS.h \
 	../src/Selection.h \
 	../src/PositionCache.h
 $(DIR_O)/RESearch.o: \
diff --git a/scintilla/win32/makefile b/scintilla/win32/makefile
index 207bc9d0f..36a22fe02 100644
--- a/scintilla/win32/makefile
+++ b/scintilla/win32/makefile
@@ -19,7 +19,6 @@ WARNINGS = -Wpedantic -Wall -Wextra
 
 ifdef CLANG
 CXX = clang++
-DEFINES += -D_CRT_SECURE_NO_DEPRECATE
 else
 # MinGW GCC
 LIBSMINGW = -lstdc++
diff --git a/scintilla/win32/nmdeps.mak b/scintilla/win32/nmdeps.mak
index 1682eb54a..62ada451c 100644
--- a/scintilla/win32/nmdeps.mak
+++ b/scintilla/win32/nmdeps.mak
@@ -373,6 +373,7 @@ $(DIR_O)/PositionCache.obj: \
 	../src/CaseFolder.h \
 	../src/Document.h \
 	../src/UniConversion.h \
+	../src/DBCS.h \
 	../src/Selection.h \
 	../src/PositionCache.h
 $(DIR_O)/RESearch.obj: \
diff --git a/scintilla/win32/scintilla.mak b/scintilla/win32/scintilla.mak
index 94c6cab3a..2031b19ec 100644
--- a/scintilla/win32/scintilla.mak
+++ b/scintilla/win32/scintilla.mak
@@ -35,7 +35,7 @@ SUBSYSTEM=-SUBSYSTEM:WINDOWS,10.00
 !ENDIF
 !ENDIF
 
-CRTFLAGS=-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_NO_DEPRECATE=1 -D_SCL_SECURE_NO_WARNINGS=1 $(ADD_DEFINE)
+CRTFLAGS=-D_CRT_SECURE_NO_DEPRECATE=1 $(ADD_DEFINE)
 CXXFLAGS=-Zi -TP -MP -W4 -EHsc -std:c++17 $(CRTFLAGS)
 CXXDEBUG=-Od -MTd -DDEBUG
 CXXNDEBUG=-O2 -MT -DNDEBUG -GL
diff --git a/scintilla/zipsrc.bat b/scintilla/zipsrc.bat
index 9d6d08b55..09f13211b 100644
--- a/scintilla/zipsrc.bat
+++ b/scintilla/zipsrc.bat
@@ -1,4 +1,6 @@
 cd ..
 del/q scintilla.zip
-zip scintilla.zip scintilla\*.* scintilla\*\*.* scintilla\*\*\*.* scintilla\*\*\*\*.* scintilla\*\*\*\*\*.* -x *.o -x *.obj -x *.dll -x *.lib -x *.res -x *.exp
+zip scintilla.zip scintilla\*.* scintilla\*\*.* scintilla\*\*\*.* scintilla\*\*\*\*.* scintilla\*\*\*\*\*.* ^
+ -x *.o *.obj *.dll *.lib *.res *.exp *.bak *.tgz ^
+ **/__pycache__/* **/Debug/* **/Release/* **/x64/* **/ARM64/* **/cov-int/* */.hg/* @
 cd scintilla